From 7610c3a509b8a04d25e72a6282d9c8ea8ecbd27f Mon Sep 17 00:00:00 2001
From: iveswang <1660583890@qq.com>
Date: 周四, 13 6月 2024 14:09:06 +0800
Subject: [PATCH] fix: QObjectPrivate::threadData type change when qt >=5.15

---
 share/install.cmake |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/share/install.cmake b/share/install.cmake
index cb4aec1..0080395 100644
--- a/share/install.cmake
+++ b/share/install.cmake
@@ -18,12 +18,16 @@
     set(QMAKE_QWK_CORE_NAME_RELEASE QWKCore)
     set(QMAKE_QWK_WIDGETS_NAME_RELEASE QWKWidgets)
     set(QMAKE_QWK_QUICK_NAME_RELEASE QWKQuick)
-    set(QMAKE_QWK_STYLESUPPORT_NAME_RELEASE QWKStyleSupport)
 
     set(QMAKE_QWK_CORE_NAME_DEBUG QWKCore${CMAKE_DEBUG_POSTFIX})
     set(QMAKE_QWK_WIDGETS_NAME_DEBUG QWKWidgets${CMAKE_DEBUG_POSTFIX})
     set(QMAKE_QWK_QUICK_NAME_DEBUG QWKQuick${CMAKE_DEBUG_POSTFIX})
-    set(QMAKE_QWK_STYLESUPPORT_NAME_DEBUG QWKStyleSupport${CMAKE_DEBUG_POSTFIX})
+
+    if(QWINDOWKIT_BUILD_STATIC)
+        set(QMAKE_QWK_CORE_STATIC_MACRO "DEFINES += QWK_CORE_STATIC")
+        set(QMAKE_QWK_WIDGETS_STATIC_MACRO "DEFINES += QWK_WIDGETS_STATIC")
+        set(QMAKE_QWK_QUICK_STATIC_MACRO "DEFINES += QWK_QUICK_STATIC")
+    endif()
 
     file(GLOB _qmake_components "${CMAKE_CURRENT_LIST_DIR}/qmake/*.pri.in")
 
@@ -60,14 +64,12 @@
         QWKCore${CMAKE_DEBUG_POSTFIX}.lib
         QWKWidgets${CMAKE_DEBUG_POSTFIX}.lib
         QWKQuick${CMAKE_DEBUG_POSTFIX}.lib
-        QWKStyleSupport${CMAKE_DEBUG_POSTFIX}.lib
     )
 
     set(MSBUILD_QWK_LIBRARY_LIST_RELEASE
         QWKCore.lib
         QWKWidgets.lib
         QWKQuick.lib
-        QWKStyleSupport.lib
     )
 
     to_dos_separator(MSBUILD_QWK_INSTALL_PREFIX)

--
Gitblit v1.9.1