From 1b303dfb28aa5375fdb76bd895ffdf60bd333fcf Mon Sep 17 00:00:00 2001 From: Sami Varanka 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. Fixes: QTBUG-91103 Fixes: QTBUG-65264 Change-Id: If0dd2dfe6a0e179ce8a21de74b3193650f3e76c1 Reviewed-by: Tomi Korpipää (cherry picked from commit 54e3c62734cb950e08a3f930880d08b9e2854e35) Reviewed-by: Qt Cherry-pick Bot --- src/datavisualization/theme/thememanager.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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(); -- cgit v1.2.3 From 088cec0354fc0efb222b7505af1c9a887479550e Mon Sep 17 00:00:00 2001 From: Tarja Sundqvist Date: Thu, 20 May 2021 14:48:44 +0300 Subject: Bump version Change-Id: I7d98c7ba3e2dbde16dccb65ea988fe0a9a26e6f5 --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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=- -- cgit v1.2.3