Share updates to QGuiApplicationPrivate::app_pal via helper function

Change-Id: I2f582358efaadcd33b39c52317222322c589423f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

3 files changed, 17 insertions, 10 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index 888ccd8453..bdcea275c3 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -3293,12 +3293,8 @@ QPalette QGuiApplication::palette()
 */
 void QGuiApplication::setPalette(const QPalette &pal)
 {
-    if (QGuiApplicationPrivate::app_pal && pal.isCopyOf(*QGuiApplicationPrivate::app_pal))
+    if (!QGuiApplicationPrivate::setPalette(pal))
         return;
-    if (!QGuiApplicationPrivate::app_pal)
-        QGuiApplicationPrivate::app_pal = new QPalette(pal);
-    else
-        *QGuiApplicationPrivate::app_pal = pal;
 
     QCoreApplication::setAttribute(Qt::AA_SetPalette);
 
@@ -3306,6 +3302,19 @@ void QGuiApplication::setPalette(const QPalette &pal)
         qGuiApp->d_func()->sendApplicationPaletteChange();
 }
 
+bool QGuiApplicationPrivate::setPalette(const QPalette &palette)
+{
+    if (app_pal && palette.isCopyOf(*app_pal))
+        return false;
+
+    if (!app_pal)
+        app_pal = new QPalette(palette);
+    else
+        *app_pal = palette;
+
+    return true;
+}
+
 void QGuiApplicationPrivate::applyWindowGeometrySpecificationTo(QWindow *window)
 {
     windowGeometrySpecification.applyTo(window);
diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h
index 26f65b2f16..7454bba0e5 100644
--- a/src/gui/kernel/qguiapplication_p.h
+++ b/src/gui/kernel/qguiapplication_p.h
@@ -323,6 +323,8 @@ public:
 
     static void resetCachedDevicePixelRatio();
 
+    static bool setPalette(const QPalette &palette);
+
 protected:
     virtual void notifyThemeChanged();
     virtual void sendApplicationPaletteChange(bool toAllWidgets = false, const char *className = nullptr);
diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index f334cc58f9..d28a425c43 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -1374,12 +1374,8 @@ void QApplicationPrivate::setPalette_helper(const QPalette &palette, const char*
     bool all = false;
     PaletteHash *hash = app_palettes();
     if (!className) {
-        if (QApplicationPrivate::app_pal && pal.isCopyOf(*QApplicationPrivate::app_pal))
+        if (!QGuiApplicationPrivate::setPalette(pal))
             return;
-        if (!QApplicationPrivate::app_pal)
-            QApplicationPrivate::app_pal = new QPalette(pal);
-        else
-            *QApplicationPrivate::app_pal = pal;
 
         if (!QApplicationPrivate::sys_pal || !palette.isCopyOf(*QApplicationPrivate::sys_pal))
             QCoreApplication::setAttribute(Qt::AA_SetPalette);