diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 03:01:19 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-07 03:01:19 +0100 |
commit | 57029b2a392951eecee8be7d5540762de546ac49 (patch) | |
tree | ff743fdecc2a4a074fcec0e1052ea587c9cbd356 /src | |
parent | ebf53010bc3150977337e7acf9385146b7b05b78 (diff) | |
parent | a315402ab232e3e4398f0b1c1d6910bdcefaec4f (diff) |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ia189ad6a24e3284a538cea1f78fcbc9b4687f6b8
Diffstat (limited to 'src')
-rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 4 |
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 |