diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2020-06-06 15:43:48 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-06-08 16:48:33 -0400 |
commit | a2052014d4438c3afe7dadb9045b4a056a74d4c9 (patch) | |
tree | fa57f39e7980d584f18bcc34c3f7e113c14ab8e1 /pcr-testing/qt5-styleplugins/qt-5.15-fix.patch | |
parent | c813ebaee65e7950a77f4129ab5bd74d0431640d (diff) | |
download | abslibre-a2052014d4438c3afe7dadb9045b4a056a74d4c9.tar.gz abslibre-a2052014d4438c3afe7dadb9045b4a056a74d4c9.tar.bz2 abslibre-a2052014d4438c3afe7dadb9045b4a056a74d4c9.zip |
[qt5-styleplugins]: rebuild for QT v5.15
Diffstat (limited to 'pcr-testing/qt5-styleplugins/qt-5.15-fix.patch')
-rw-r--r-- | pcr-testing/qt5-styleplugins/qt-5.15-fix.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/pcr-testing/qt5-styleplugins/qt-5.15-fix.patch b/pcr-testing/qt5-styleplugins/qt-5.15-fix.patch new file mode 100644 index 000000000..eff5a3e88 --- /dev/null +++ b/pcr-testing/qt5-styleplugins/qt-5.15-fix.patch @@ -0,0 +1,30 @@ +diff --git a/src/plugins/styles/gtk2/qgtkstyle.cpp b/src/plugins/styles/gtk2/qgtkstyle.cpp +index 36169c9..6138bd2 100644 +--- a/src/plugins/styles/gtk2/qgtkstyle.cpp ++++ b/src/plugins/styles/gtk2/qgtkstyle.cpp +@@ -440,7 +440,11 @@ 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()); ++#else ++ QApplication::setPalette(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(); |