summaryrefslogtreecommitdiffstats
path: root/source/l/qt/patches/qt-prefer_adwaita_on_gnome.patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-05-04 01:29:20 +0000
committer Eric Hameleers <alien@slackware.com>2019-05-04 08:59:47 +0200
commit125048ad7d212c1f226b709697505b0ee6a079e4 (patch)
tree4d930a5b4d508518dedfc25375251fe24dda7b92 /source/l/qt/patches/qt-prefer_adwaita_on_gnome.patch
parentfe8c535f50697455b55b8ded880317ac33910704 (diff)
downloadcurrent-125048ad7d212c1f226b709697505b0ee6a079e4.tar.gz
current-125048ad7d212c1f226b709697505b0ee6a079e4.tar.xz
Sat May 4 01:29:20 UTC 201920190504012920
d/gcc-9.1.0-x86_64-1.txz: Upgraded. d/gcc-brig-9.1.0-x86_64-1.txz: Upgraded. d/gcc-g++-9.1.0-x86_64-1.txz: Upgraded. d/gcc-gfortran-9.1.0-x86_64-1.txz: Upgraded. d/gcc-gnat-9.1.0-x86_64-1.txz: Upgraded. d/gcc-go-9.1.0-x86_64-1.txz: Upgraded. Shared library .so-version bump. d/gcc-objc-9.1.0-x86_64-1.txz: Upgraded. d/libtool-2.4.6-x86_64-11.txz: Rebuilt. Recompiled to update embedded GCC version number. d/llvm-8.0.0-x86_64-2.txz: Rebuilt. Recompiled with -DLLVM_INSTALL_UTILS=ON. Thanks to Lockywolf. d/swig-4.0.0-x86_64-1.txz: Upgraded. l/glib2-2.60.2-x86_64-1.txz: Upgraded. l/qt-4.8.7-x86_64-13.txz: Rebuilt. Patched to fix FTBFS with gcc9 (also fixes FTBFS with qtscriptgenerator and possibly other projects that use qt4).
Diffstat (limited to 'source/l/qt/patches/qt-prefer_adwaita_on_gnome.patch')
-rw-r--r--source/l/qt/patches/qt-prefer_adwaita_on_gnome.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/source/l/qt/patches/qt-prefer_adwaita_on_gnome.patch b/source/l/qt/patches/qt-prefer_adwaita_on_gnome.patch
new file mode 100644
index 000000000..71e30c4f9
--- /dev/null
+++ b/source/l/qt/patches/qt-prefer_adwaita_on_gnome.patch
@@ -0,0 +1,17 @@
+--- src/gui/kernel/qguiplatformplugin.cpp.adwaita 2015-02-12 14:32:45.217935391 +0100
++++ src/gui/kernel/qguiplatformplugin.cpp 2015-02-12 14:46:11.471866038 +0100
+@@ -165,8 +165,13 @@ QString QGuiPlatformPlugin::styleName()
+ case DE_GNOME: {
+ QStringList availableStyles = QStyleFactory::keys();
+ // Set QGtkStyle for GNOME if available
++ QString adwaitaStyleKey = QString::fromLatin1("adwaita");
+ QString gtkStyleKey = QString::fromLatin1("GTK+");
+- if (availableStyles.contains(gtkStyleKey)) {
++ if (availableStyles.contains(adwaitaStyleKey)) {
++ stylename = adwaitaStyleKey;
++ break;
++ }
++ else if (availableStyles.contains(gtkStyleKey)) {
+ stylename = gtkStyleKey;
+ break;
+ }