feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Fix compile on Win

Browse Source 
Change-Id: I193eb9a6720120f7014eca129463b43db1065455
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Christian Stenger
2019-09-23 09:15:17 +02:00
committed by Eike Ziller
parent 78780bb2db
commit 2abf82434e
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/help/qlitehtml/qlitehtml.pri
View File

@@ -19,6 +19,7 @@ exists($$PWD/litehtml/CMakeLists.txt) {
-DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \
$$LITEHTML_UTF8 \ $$LITEHTML_UTF8 \
$$CMAKE_DEPLOYMENT_TARGET \ $$CMAKE_DEPLOYMENT_TARGET \
-G $$system_quote('NMake Makefiles') \
$$system_quote($$shell_path($${LITEHTML_SOURCE_PATH}))" $$system_quote($$shell_path($${LITEHTML_SOURCE_PATH}))"
message("$${LITEHTML_CMAKE_CMD}") message("$${LITEHTML_CMAKE_CMD}")
system("$${LITEHTML_CMAKE_CMD}") system("$${LITEHTML_CMAKE_CMD}")
@@ -50,5 +51,7 @@ SOURCES += \
INCLUDEPATH += $$PWD $$LITEHTML_INCLUDE_DIRS INCLUDEPATH += $$PWD $$LITEHTML_INCLUDE_DIRS
LIBS += -L$$LITEHTML_LIB_DIR -llitehtml -lgumbo LIBS += -L$$LITEHTML_LIB_DIR -llitehtml -lgumbo
DEFINES += LITEHTML_UTF8
win32: PRE_TARGETDEPS += $$LITEHTML_LIB_DIR/litehtml.lib $$LITEHTML_LIB_DIR/gumbo.lib win32: PRE_TARGETDEPS += $$LITEHTML_LIB_DIR/litehtml.lib $$LITEHTML_LIB_DIR/gumbo.lib
else:unix: PRE_TARGETDEPS += $$LITEHTML_LIB_DIR/liblitehtml.a $$LITEHTML_LIB_DIR/libgumbo.a else:unix: PRE_TARGETDEPS += $$LITEHTML_LIB_DIR/liblitehtml.a $$LITEHTML_LIB_DIR/libgumbo.a