From 9dcea027f16c4ce5852da3dfc8aca284c582bd7d Mon Sep 17 00:00:00 2001
From: sola.lu <sola.lu.greentest.com.cn>
Date: 周五, 06 6月 2025 18:19:18 +0800
Subject: [PATCH] 1.注释掉custom margin，解决程序放大后，遮盖窗口底部内容的问题。
---
share/install.cmake | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/share/install.cmake b/share/install.cmake
index cb4aec1..1e64011 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)
@@ -75,6 +77,12 @@
to_dos_separator(MSBUILD_QWK_INSTALL_LIBDIR)
to_dos_separator(MSBUILD_QWK_INSTALL_INCDIR)
+ if(QWINDOWKIT_BUILD_STATIC)
+ set(MSBUILD_QWK_STATIC_MACRO
+ "<PreprocessorDefinitions>QWK_CORE_STATIC;QWK_WIDGETS_STATIC;QWK_QUICK_STATIC</PreprocessorDefinitions>"
+ )
+ endif()
+
configure_file(${CMAKE_CURRENT_LIST_DIR}/msbuild/QWindowKit.props.in
${_build_data_dir}/msbuild/QWindowKit.props
@ONLY
--
Gitblit v1.9.1