diff options
| author | Sami Varanka <sami.varanka@qt.io> | 2021-05-03 13:22:40 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-05-07 09:15:17 +0000 |
| commit | 1b303dfb28aa5375fdb76bd895ffdf60bd333fcf (patch) | |
| tree | de8eb20f5833b56cc262bcba65675c8ac2de0cd0 | |
| parent | 2f208b8c4f46f0bfe08a93f0e23aeb2caa80e6b2 (diff) | |
Fix QML theme showing totally dark
Added check for new theme's forcePredefinedType
in ThemeManager's setActiveTheme before resetting
new theme's dirtyBits.
Fixes: QTBUG-91103
Fixes: QTBUG-65264
Change-Id: If0dd2dfe6a0e179ce8a21de74b3193650f3e76c1
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
(cherry picked from commit 54e3c62734cb950e08a3f930880d08b9e2854e35)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/datavisualization/theme/thememanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/datavisualization/theme/thememanager.cpp b/src/datavisualization/theme/thememanager.cpp index dbf5ce76..4e8faebd 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(); |