Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
qtstyleplugins: Fix build with qt>=5.15
- Loading branch information
1 parent
5f4b381
commit ff6c3a9
Showing
2 changed files
with
46 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
44 changes: 44 additions & 0 deletions
44
pkgs/development/libraries/qtstyleplugins/fix-build-against-Qt-5.15.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
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 | ||
|
ff6c3a9
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Backported in #97965