diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2019-09-23 09:37:05 +0200 |
|---|---|---|
| committer | Christian Stenger <christian.stenger@qt.io> | 2019-09-23 07:58:42 +0000 |
| commit | 9f8f0b3f5c78f5d7939eb060f9e96cd099662714 (patch) | |
| tree | 5c69f3f6941853948748c2bed812da6d43c67db6 | |
| parent | 2abf82434e18b9a16012200dbd003b2a60b7886d (diff) | |
| download | qt-creator-9f8f0b3f5c78f5d7939eb060f9e96cd099662714.tar.gz | |
Help: And fix build for non-Windows again
Change-Id: I13525d28361925aa4f5ec7cb2e4b3f3e45faf9c1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
| -rw-r--r-- | src/plugins/help/qlitehtml/qlitehtml.pri | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/help/qlitehtml/qlitehtml.pri b/src/plugins/help/qlitehtml/qlitehtml.pri index 0b865f717b..54a0e78db0 100644 --- a/src/plugins/help/qlitehtml/qlitehtml.pri +++ b/src/plugins/help/qlitehtml/qlitehtml.pri @@ -11,15 +11,14 @@ exists($$PWD/litehtml/CMakeLists.txt) { system("$$sprintf($$QMAKE_MKDIR_CMD, $$shell_path($${LITEHTML_BUILD_PATH}))") macos: CMAKE_DEPLOYMENT_TARGET = -DCMAKE_OSX_DEPLOYMENT_TARGET=$${QMAKE_MACOSX_DEPLOYMENT_TARGET} - win32: LITEHTML_UTF8 = -DLITEHTML_UTF8=ON + win32: WINDOWS_OPTIONS = -DLITEHTML_UTF8=ON -G $$system_quote('NMake Makefiles') LITEHTML_CMAKE_CMD = \ "$$QMAKE_CD $$system_quote($$shell_path($${LITEHTML_BUILD_PATH})) && \ cmake -DCMAKE_BUILD_TYPE=$$BUILD_TYPE \ -DCMAKE_INSTALL_PREFIX=$$system_quote($$shell_path($${LITEHTML_INSTALL_PATH})) \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ - $$LITEHTML_UTF8 \ + $$WINDOWS_OPTIONS \ $$CMAKE_DEPLOYMENT_TARGET \ - -G $$system_quote('NMake Makefiles') \ $$system_quote($$shell_path($${LITEHTML_SOURCE_PATH}))" message("$${LITEHTML_CMAKE_CMD}") system("$${LITEHTML_CMAKE_CMD}") |