summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarja Sundqvist <tarja.sundqvist@qt.io>2022-05-16 18:16:38 +0300
committerTarja Sundqvist <tarja.sundqvist@qt.io>2022-05-16 18:16:38 +0300
commita32c95d27224c6c9e41d6080ea54bc937c5d1455 (patch)
treee1ffa2c7a0a6f27272be9d0af19bbffd281f7f9e
parent5f8e2a037d5201c902149c828d102b71e90257e2 (diff)
parent088cec0354fc0efb222b7505af1c9a887479550e (diff)
Merge remote-tracking branch 'origin/tqtc/lts-5.15.5' into tqtc/lts-5.15-opensourcev5.15.5-lts-lgpl
-rw-r--r--.qmake.conf2
-rw-r--r--src/datavisualization/theme/thememanager.cpp3
2 files changed, 3 insertions, 2 deletions
diff --git a/.qmake.conf b/.qmake.conf
index c7a6938a..c297e52d 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,6 +2,6 @@ load(qt_build_config)
DEFINES += QT_NO_JAVA_STYLE_ITERATORS QT_NO_LINKED_LIST
-MODULE_VERSION = 5.15.4
+MODULE_VERSION = 5.15.5
CONFIG += warning_clean
CMAKE_MODULE_TESTS=-
diff --git a/src/datavisualization/theme/thememanager.cpp b/src/datavisualization/theme/thememanager.cpp
index 01c7c10b..fb06b11c 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();