Contain Qt::AA_SetPalette logic in QApplicationPrivate::setPalette_helper

Change-Id: I88b36e800139389895ecb1a15553207a24b3e3a4
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>

1 files changed, 4 insertions, 3 deletions

diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp
index a74b45f377..bf3cf090ba 100644
--- a/src/widgets/kernel/qapplication.cpp
+++ b/src/widgets/kernel/qapplication.cpp
@@ -1380,6 +1380,10 @@ void QApplicationPrivate::setPalette_helper(const QPalette &palette, const char*
             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);
+
         if (hash && hash->size()) {
             all = true;
             if (clearWidgetPaletteHash)
@@ -1389,9 +1393,6 @@ void QApplicationPrivate::setPalette_helper(const QPalette &palette, const char*
         hash->insert(className, pal);
     }
 
-    if (!className && (!QApplicationPrivate::sys_pal || !palette.isCopyOf(*QApplicationPrivate::sys_pal)))
-        QCoreApplication::setAttribute(Qt::AA_SetPalette);
-
     if (qApp)
         qApp->d_func()->sendApplicationPaletteChange(all, className);
 }