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

Help: Fix linking on Windows

Browse Source 
Amends bf536a0441.

Change-Id: Iad9172f5062640ec84debfb2ba3c307fe765c770
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2020-09-23 12:40:39 +02:00
parent 361b5e3530
commit 822aa7b242
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -155,3 +155,5 @@ SOURCES += \
INCLUDEPATH *= $$PWD INCLUDEPATH *= $$PWD
win32: DEFINES += LITEHTML_UTF8 win32: DEFINES += LITEHTML_UTF8
DEFINES *= QLITEHTML_STATIC_LIBRARY

7
src/plugins/help/qlitehtml/qlitehtml.qbs
View File

@@ -15,7 +15,12 @@ Product {
property string gumboHeaderDir: gumboSrcDir + "/include/gumbo" property string gumboHeaderDir: gumboSrcDir + "/include/gumbo"
property string litehtmlHeaderDir: path + "/litehtml/include/litehtml" property string litehtmlHeaderDir: path + "/litehtml/include/litehtml"
property string mainHeaderDir: litehtmlHeaderDir + '/..' property string mainHeaderDir: litehtmlHeaderDir + '/..'
property stringList sharedDefines: qbs.targetOS.contains("windows") ? ["LITEHTML_UTF8"] : [] property stringList sharedDefines: {
var defines = ["QLITEHTML_STATIC_LIBRARY"];
if (qbs.targetOS.contains("windows"))
defines.push("LITEHTML_UTF8");
return defines;
}
cpp.defines: sharedDefines cpp.defines: sharedDefines
cpp.includePaths: { cpp.includePaths: {