diff --git a/deepin-qt5integration-fix-build-with-qt5-13.patch b/deepin-qt5integration-fix-build-with-qt5-13.patch deleted file mode 100644 index 03e6c3c..0000000 --- a/deepin-qt5integration-fix-build-with-qt5-13.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 63861ee75c5b1492957c2bc93d797b4aa8b25c77 Mon Sep 17 00:00:00 2001 -From: Felix Yan -Date: Wed, 26 Jun 2019 11:53:40 +0800 -Subject: [PATCH] fix: build failure under Qt 5.13 - ---- - dstyleplugin/style.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/dstyleplugin/style.cpp b/dstyleplugin/style.cpp -index 04e03fe..4b8f3ec 100644 ---- a/dstyleplugin/style.cpp -+++ b/dstyleplugin/style.cpp -@@ -1418,6 +1418,6 @@ void Style::fillBrush(QPainter *p, const QRect &rect, const QBrush &brush, qreal - } - } - --#include "moc_style.cpp" -- - } -+ -+#include "moc_style.cpp" diff --git a/deepin-qt5integration-qt5.13.patch b/deepin-qt5integration-qt5.13.patch new file mode 100644 index 0000000..6863fd6 --- /dev/null +++ b/deepin-qt5integration-qt5.13.patch @@ -0,0 +1,11 @@ +diff --git a/dstyleplugin/style.cpp b/dstyleplugin/style.cpp +index 04e03fe..65be15f 100644 +--- a/dstyleplugin/style.cpp ++++ b/dstyleplugin/style.cpp +@@ -1418,6 +1418,4 @@ void Style::fillBrush(QPainter *p, const QRect &rect, const QBrush &brush, qreal + } + } + +-#include "moc_style.cpp" +- + } diff --git a/deepin-qt5integration-qt5.14.patch b/deepin-qt5integration-qt5.14.patch new file mode 100644 index 0000000..9c90d68 --- /dev/null +++ b/deepin-qt5integration-qt5.14.patch @@ -0,0 +1,46 @@ +diff --git a/platformthemeplugin/qdeepintheme.cpp b/platformthemeplugin/qdeepintheme.cpp +index e98487b..45e90bc 100644 +--- a/platformthemeplugin/qdeepintheme.cpp ++++ b/platformthemeplugin/qdeepintheme.cpp +@@ -571,10 +571,18 @@ static bool updateScreenScaleFactors(DThemeSettings *s, const QByteArray &value, + } + + QHighDpiScaling::updateHighDpiScaling(); ++#if QT_VERSION < QT_VERSION_CHECK(5,14,0) + qDebug() << QHighDpiScaling::logicalDpi(); ++#else ++ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen()); ++#endif + updateScaleLogcailDpi(s->scaleLogicalDpi()); + ++#if QT_VERSION < QT_VERSION_CHECK(5,14,0) + qDebug() << QHighDpiScaling::logicalDpi(); ++#else ++ qDebug() << QHighDpiScaling::logicalDpi(QGuiApplication::primaryScreen()); ++#endif + + return true; + } +--- a/platformthemeplugin/qdeepintheme.cpp 2019-12-19 17:45:47.396894045 +0800 ++++ b/platformthemeplugin/qdeepintheme.cpp 2019-12-19 17:46:28.436136243 +0800 +@@ -516,19 +516,7 @@ + static bool updateScaleLogcailDpi(const QPair &dpi) + { + bool ok = dpi.first >= 0 && dpi.second >= 0; +- +- if (dpi.first > 0) { +- QHighDpiScaling::m_logicalDpi.first = dpi.first; +- } else if (qIsNull(dpi.first)) { +- QHighDpiScaling::m_logicalDpi.first = qGuiApp->primaryScreen()->handle()->logicalDpi().first; +- } +- +- if (dpi.second > 0) { +- QHighDpiScaling::m_logicalDpi.second = dpi.second; +- } else if (qIsNull(dpi.second)) { +- QHighDpiScaling::m_logicalDpi.second = qGuiApp->primaryScreen()->handle()->logicalDpi().second; +- } +- ++ QHighDpiScaling::m_usePixelDensity = false; + return ok; + } + diff --git a/deepin-qt5integration.spec b/deepin-qt5integration.spec index b9f5175..f690693 100644 --- a/deepin-qt5integration.spec +++ b/deepin-qt5integration.spec @@ -10,7 +10,10 @@ License: GPLv3 and BSD and LGPLv2+ URL: https://github.com/linuxdeepin/qt5integration Source0: %{url}/archive/%{version}/%{repo}-%{version}.tar.gz -Patch0: deepin-qt5integration-fix-build-with-qt5-13.patch +# https://git.archlinux.org/svntogit/community.git/plain/trunk/deepin-qt5integration-qt5.13.patch?h=packages/deepin-qt5integration&id=b9bad53f20d27a15f9587f39db3e1a0243ec6880 +Patch0: deepin-qt5integration-qt5.13.patch +# https://git.archlinux.org/svntogit/community.git/plain/trunk/deepin-qt5integration-qt5.14.patch?h=packages/deepin-qt5integration&id=b9bad53f20d27a15f9587f39db3e1a0243ec6880 +Patch1: deepin-qt5integration-qt5.14.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig(atk) @@ -49,6 +52,7 @@ Multiple Qt plugins to provide better Qt5 integration for DDE is included. %setup -q -n %{repo}-%{version} %patch0 -p1 -b .fix-build-with-qt5-13 +%patch1 -p1 -b .fix-build-with-qt5-14 %build %qmake_qt5 PREFIX=%{_prefix} @@ -66,6 +70,9 @@ Multiple Qt plugins to provide better Qt5 integration for DDE is included. %{_qt5_plugindir}/imageformats/libdsvg.so %changelog +* Tue Apr 7 2020 Robin Lee - 5.0.0-5 +- Fix build with Qt 5.14.2 + * Mon Apr 06 2020 Rex Dieter - 5.0.0-5 - rebuild (qt5)