diff --git a/0002-build-qt5.11.1-Adaptation-Qt5.11.1.patch b/0002-build-qt5.11.1-Adaptation-Qt5.11.1.patch deleted file mode 100644 index da23be021bf62d882e2bc808eb01465c474469ed..0000000000000000000000000000000000000000 --- a/0002-build-qt5.11.1-Adaptation-Qt5.11.1.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b4a50383201b332bc13c90033f1d9821b2e0e0f7 Mon Sep 17 00:00:00 2001 -From: liuxinhao -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::of(&QSignalMapper::mapped), this, &FontSizeManagerPrivate::handleBindWidgetDestroyed); -+#endif - } - - void updateWidgetFont() --- -2.33.0 - diff --git a/kiran-qt5-integration.spec b/kiran-qt5-integration.spec index 5835e225223cf8b0013f5d2cf98e1e4db550baa4..e33d0ac99d078c66d99c8da33715b5823eda240e 100644 --- a/kiran-qt5-integration.spec +++ b/kiran-qt5-integration.spec @@ -1,6 +1,6 @@ Name: kiran-qt5-integration Version: 2.4.0 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Kiran desktop platform integration plugin. License: MulanPSL-2.0 @@ -58,10 +58,10 @@ Requires: %{name} = %{version}-%{release} %build %cmake -make %{?_smp_mflags} +%cmake_build %install -%make_install +%cmake_install %files %{_libdir}/qt5/plugins/* @@ -74,6 +74,9 @@ make %{?_smp_mflags} %{_libdir}/pkgconfig/kiran-style-helper.pc %changelog +* Wed Nov 20 2024 Funda Wang - 2.4.0-17 +- adopt to new cmake macro + * Mon Apr 15 2024 youzhengcai - 2.4.0-16 - rebuil for 3.6.1