33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
|
From b4a50383201b332bc13c90033f1d9821b2e0e0f7 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: liuxinhao <liuxinhao@kylinsec.com.cn>
|
|||
|
|
Date: Fri, 7 Apr 2023 09:27:04 +0800
|
|||
|
|
Subject: [PATCH 2/2] build(qt5.11.1): Adaptation Qt5.11.1
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
- 适配Qt5.11.1，通过宏区分调用Qt5.11.1的接口
|
|||
|
|
---
|
|||
|
|
style-helper/src/font-size-manager-private.h | 4 ++++
|
|||
|
|
1 file changed, 4 insertions(+)
|
|||
|
|
|
|||
|
|
diff --git a/style-helper/src/font-size-manager-private.h b/style-helper/src/font-size-manager-private.h
|
|||
|
|
index a7a5577..eccf04b 100644
|
|||
|
|
--- a/style-helper/src/font-size-manager-private.h
|
|||
|
|
+++ b/style-helper/src/font-size-manager-private.h
|
|||
|
|
@@ -26,7 +26,11 @@ public:
|
|||
|
|
void init()
|
|||
|
|
{
|
|||
|
|
connect(qGuiApp, &QGuiApplication::fontChanged, this, &FontSizeManagerPrivate::handleGuiAppFontChanged);
|
|||
|
|
+#if (QT_VERSION >= QT_VERSION_CHECK(5, 15, 0))
|
|||
|
|
connect(&m_destorySignalMapper, &QSignalMapper::mappedWidget, this, &FontSizeManagerPrivate::handleBindWidgetDestroyed);
|
|||
|
|
+#else
|
|||
|
|
+ connect(&m_destorySignalMapper, QOverload<QWidget *>::of(&QSignalMapper::mapped), this, &FontSizeManagerPrivate::handleBindWidgetDestroyed);
|
|||
|
|
+#endif
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
void updateWidgetFont()
|
|||
|
|
--
|
|||
|
|
2.33.0
|
|||
|
|
|