From 54e3c62734cb950e08a3f930880d08b9e2854e35 Mon Sep 17 00:00:00 2001
From: Sami Varanka <sami.varanka@qt.io>
Date: Mon, 3 May 2021 13:22:40 +0300
Subject: Fix QML theme showing totally dark
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Added check for new theme's forcePredefinedType
in ThemeManager's setActiveTheme before resetting
new theme's dirtyBits.

Pick-to: 6.1 5.15
Fixes: QTBUG-91103
Fixes: QTBUG-65264
Change-Id: If0dd2dfe6a0e179ce8a21de74b3193650f3e76c1
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
---
 src/datavisualization/theme/thememanager.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/datavisualization')

diff --git a/src/datavisualization/theme/thememanager.cpp b/src/datavisualization/theme/thememanager.cpp
index 4f469506..e109e4f1 100644
--- a/src/datavisualization/theme/thememanager.cpp
+++ b/src/datavisualization/theme/thememanager.cpp
@@ -101,7 +101,8 @@ void ThemeManager::setActiveTheme(Q3DTheme *theme)
     m_activeTheme = theme;
 
     // Reset all bits to dirty for sync
-    m_activeTheme->d_ptr->resetDirtyBits();
+    if (theme->d_ptr->isForcePredefinedType())
+        m_activeTheme->d_ptr->resetDirtyBits();
 
     // Connect signals from new one
     connectThemeSignals();
-- 
cgit v1.2.3