summaryrefslogtreecommitdiffstats
path: root/src/datavisualizationqml2
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-07 03:01:19 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2020-01-07 03:01:19 +0100
commit57029b2a392951eecee8be7d5540762de546ac49 (patch)
treeff743fdecc2a4a074fcec0e1052ea587c9cbd356 /src/datavisualizationqml2
parentebf53010bc3150977337e7acf9385146b7b05b78 (diff)
parenta315402ab232e3e4398f0b1c1d6910bdcefaec4f (diff)
Merge remote-tracking branch 'origin/5.15' into dev
Diffstat (limited to 'src/datavisualizationqml2')
-rw-r--r--src/datavisualizationqml2/abstractdeclarative.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp
index 03d1f41d..4cec3bc8 100644
--- a/src/datavisualizationqml2/abstractdeclarative.cpp
+++ b/src/datavisualizationqml2/abstractdeclarative.cpp
@@ -678,7 +678,7 @@ void AbstractDeclarative::checkWindowList(QQuickWindow *window)
}
if (oldWindow && !windowList.contains(oldWindow)
- && windowClearList.values(oldWindow).size() != 0) {
+ && windowClearList.contains(oldWindow)) {
// Return window clear value
oldWindow->setClearBeforeRendering(windowClearList.value(oldWindow));
windowClearList.remove(oldWindow);
@@ -691,7 +691,7 @@ void AbstractDeclarative::checkWindowList(QQuickWindow *window)
if ((m_renderMode == RenderDirectToBackground
|| m_renderMode == RenderDirectToBackground_NoClear)
- && windowClearList.values(window).size() == 0) {
+ && !windowClearList.contains(window)) {
// Save old clear value
windowClearList[window] = window->clearBeforeRendering();
// Disable clearing of the window as we render underneath