kiran-qt5-integration/0002-build-qt5.11.1-Adaptation-Qt5.11.1.patch
liuxinhao 343de37831 fix(arrow & qt5.11.1): Adjust the theme drawing arrow,Adaptation Qt5.11.1
- 调整主题绘制箭头.适配Qt5.11.1,通过宏区分调用Qt5.11.1的接口

(cherry picked from commit 1a343777fb49a7f1bd89c51e8b28de741ac43b25)
2023-04-07 11:25:20 +08:00

33 lines
1.2 KiB
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

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