diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2020-11-23 22:52:53 -0500 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-11-23 23:04:45 -0500 |
commit | ad36e765afec78a9a490432cd1fed9938dbf10a5 (patch) | |
tree | f4a4d0a6b7bd6db6cf3b15b47b03573bb81603d0 /pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch | |
parent | b0ef492015e7338079d1eeba8a78ae473aab40fd (diff) | |
download | abslibre-ad36e765afec78a9a490432cd1fed9938dbf10a5.tar.gz abslibre-ad36e765afec78a9a490432cd1fed9938dbf10a5.tar.bz2 abslibre-ad36e765afec78a9a490432cd1fed9938dbf10a5.zip |
[qt5-styleplugins]: move to libre - rebuild agianst latest QT5
Diffstat (limited to 'pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch')
-rw-r--r-- | pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch b/pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch deleted file mode 100644 index 7eb744158..000000000 --- a/pcr-testing/qt5-styleplugins/0001-fix-build-against-Qt-5.15.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 335dbece103e2cbf6c7cf819ab6672c2956b17b3 Mon Sep 17 00:00:00 2001 -From: Fabian Vogt <fvogt@suse.de> -Date: Thu, 28 May 2020 12:35:42 +0200 -Subject: [PATCH] fix build against Qt 5.15 - -With 0a93db4d82c051164923a10e4382b12de9049b45 ("Unify application -palette handling between QGuiApplication and QApplication") -QApplicationPrivate::setSystemPalette is no longer used and necessary. ---- - src/plugins/styles/gtk2/qgtkstyle.cpp | 2 ++ - src/plugins/styles/gtk2/qgtkstyle_p.cpp | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp -index 36169c9..2544593 100644 ---- a/src/plugins/styles/gtk2/qgtkstyle.cpp -+++ b/src/plugins/styles/gtk2/qgtkstyle.cpp -@@ -440,7 +440,9 @@ void QGtkStyle::polish(QApplication *app) - // not supported as these should be entirely determined by - // current Gtk settings - if (app->desktopSettingsAware() && d->isThemeAvailable()) { -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QApplicationPrivate::setSystemPalette(standardPalette()); -+#endif - QApplicationPrivate::setSystemFont(d->getThemeFont()); - d->applyCustomPaletteHash(); - if (!d->isKDE4Session()) -diff --git a/src/plugins/styles/gtk2/qgtkstyle_p.cpp b/src/plugins/styles/gtk2/qgtkstyle_p.cpp -index e57b3d8..e71beb0 100644 ---- a/src/plugins/styles/gtk2/qgtkstyle_p.cpp -+++ b/src/plugins/styles/gtk2/qgtkstyle_p.cpp -@@ -508,7 +508,9 @@ void QGtkStyleUpdateScheduler::updateTheme() - if (oldTheme != QGtkStylePrivate::getThemeName()) { - oldTheme = QGtkStylePrivate::getThemeName(); - QPalette newPalette = qApp->style()->standardPalette(); -+#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) - QApplicationPrivate::setSystemPalette(newPalette); -+#endif - QApplication::setPalette(newPalette); - if (!QGtkStylePrivate::instances.isEmpty()) { - QGtkStylePrivate::instances.last()->initGtkWidgets(); --- -2.26.2 - |