From 822aa7b242cf50ee1c6395cdfa6e6f618e30bd5e Mon Sep 17 00:00:00 2001
From: Christian Stenger <christian.stenger@qt.io>
Date: Wed, 23 Sep 2020 12:40:39 +0200
Subject: [PATCH] Help: Fix linking on Windows

Amends bf536a04413.

Change-Id: Iad9172f5062640ec84debfb2ba3c307fe765c770
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
---
 src/plugins/help/qlitehtml/qlitehtml.pri | 2 ++
 src/plugins/help/qlitehtml/qlitehtml.qbs | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/plugins/help/qlitehtml/qlitehtml.pri b/src/plugins/help/qlitehtml/qlitehtml.pri
index 30da525b2cc..0ba1b5defd2 100644
--- a/src/plugins/help/qlitehtml/qlitehtml.pri
+++ b/src/plugins/help/qlitehtml/qlitehtml.pri
@@ -155,3 +155,5 @@ SOURCES += \
 
 INCLUDEPATH *= $$PWD
 win32: DEFINES += LITEHTML_UTF8
+
+DEFINES *= QLITEHTML_STATIC_LIBRARY
diff --git a/src/plugins/help/qlitehtml/qlitehtml.qbs b/src/plugins/help/qlitehtml/qlitehtml.qbs
index 179b0db4c50..96c09b7336e 100644
--- a/src/plugins/help/qlitehtml/qlitehtml.qbs
+++ b/src/plugins/help/qlitehtml/qlitehtml.qbs
@@ -15,7 +15,12 @@ Product {
     property string gumboHeaderDir: gumboSrcDir + "/include/gumbo"
     property string litehtmlHeaderDir: path + "/litehtml/include/litehtml"
     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.includePaths: {