mirror of
git://slackware.nl/current.git
synced 2024-12-31 10:28:29 +01:00
125048ad7d
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).
17 lines
798 B
Diff
17 lines
798 B
Diff
--- 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;
|
|
}
|