diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-19 08:46:43 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2014-02-19 08:49:53 +0200 |
| commit | bcd1342ab39830ac32aaeca9dfb5fd6b99f21535 (patch) | |
| tree | 8f37465f8700c2569cac7775a33ed5771289c332 /src | |
| parent | 607bf2f4ab8b5d5e0d6492c33543cab36e5973ee (diff) | |
Fix indirect rendering issue with boot2qt launcher
Also fix the RenderDirectToBackground_NoClear mode.
Change-Id: Ib3b05a4f576767c82c785bf3b33c671368b407a7
Reviewed-by: Tomi Korpipää <tomi.korpipaa@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/datavisualizationqml2/abstractdeclarative.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/datavisualizationqml2/abstractdeclarative.cpp b/src/datavisualizationqml2/abstractdeclarative.cpp index 9ceea870..97929302 100644 --- a/src/datavisualizationqml2/abstractdeclarative.cpp +++ b/src/datavisualizationqml2/abstractdeclarative.cpp @@ -387,11 +387,14 @@ void AbstractDeclarative::checkWindowList(QQuickWindow *window) QList<QQuickWindow *> windowList; foreach (AbstractDeclarative *graph, graphWindowList.keys()) { - if (graph->m_renderMode == RenderDirectToBackground) + if (graph->m_renderMode == RenderDirectToBackground + || graph->m_renderMode == RenderDirectToBackground_NoClear) { windowList.append(graphWindowList.value(graph)); + } } - if (oldWindow && !windowList.contains(oldWindow)) { + if (oldWindow && !windowList.contains(oldWindow) + && windowClearList.values(oldWindow).size() != 0) { // Return window clear value oldWindow->setClearBeforeRendering(windowClearList.value(oldWindow)); windowClearList.remove(oldWindow); @@ -402,7 +405,8 @@ void AbstractDeclarative::checkWindowList(QQuickWindow *window) return; } - if (m_renderMode == RenderDirectToBackground && windowClearList.values(window).size() == 0) { + if ((m_renderMode == RenderDirectToBackground || m_renderMode == RenderDirectToBackground_NoClear) + && windowClearList.values(window).size() == 0) { // Save old clear value windowClearList[window] = window->clearBeforeRendering(); // Disable clearing of the window as we render underneath |