apply palette from the QGuiPlatformPlugin instance if it is not null

palette from the config overrides even the platform plugin still (as it is
with the style for example)

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp
index 87f6ee9..7ab7a8b 100644 (file)
--- a/src/gui/kernel/qapplication_x11.cpp
+++ b/src/gui/kernel/qapplication_x11.cpp
@@ -599,9 +599,14 @@ bool QApplicationPrivate::x11_apply_settings()
                          QColor(strlist[i]));
     }
 
-    // ### Fix properly for 4.6
-    if (groupCount == QPalette::NColorGroups)
+    if (groupCount == QPalette::NColorGroups) {
         QApplicationPrivate::setSystemPalette(pal);
+    } else {
+        pal = qt_guiPlatformPlugin()->palette();
+        if (pal != QPalette()) {
+            QApplicationPrivate::setSystemPalette(pal);
+        }
+    }
 
     QString fontDescription = settings.string(QLatin1String("Qt/font"));
     if (!fontDescription.isEmpty()) {