Merge pull request #73 from adenexter/jb28600

Backport the QQuickWindow::sceneGraphAboutToStop() signal.
sailfishos · Jun 25, 2015 · c534df3 · c534df3
2 parents 10c6012 + 9aebec5
commit c534df3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 0 deletions.
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
@@ -148,6 +148,7 @@ class Q_QUICK_EXPORT QQuickWindow : public QWindow
     void beforeSynchronizing();
     void beforeRendering();
     void afterRendering();
+    void sceneGraphAboutToStop();
     Q_REVISION(1) void closing(QQuickCloseEvent *close);
     void colorChanged(const QColor &);
     Q_REVISION(1) void activeFocusItemChanged();

diff --git a/src/quick/items/qquickwindow_p.h b/src/quick/items/qquickwindow_p.h
@@ -208,6 +208,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickWindowPrivate : public QWindowPrivate
     void updateDirtyNode(QQuickItem *);
 
     void fireFrameSwapped() { Q_EMIT q_func()->frameSwapped(); }
+    void fireAboutToStop() { Q_EMIT q_func()->sceneGraphAboutToStop(); }
 
     QSGRenderContext *context;
     QSGRenderer *renderer;

diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -240,6 +240,7 @@ void QSGGuiThreadRenderLoop::hide(QQuickWindow *window)
     QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
     if (gl)
         gl->makeCurrent(window);
+    cd->fireAboutToStop();
     cd->cleanupNodesOnShutdown();
 
     if (m_windows.size() == 0) {

diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -351,6 +351,8 @@ bool QSGRenderThread::event(QEvent *e)
         mutex.lock();
         if (window) {
             qCDebug(QSG_LOG_RENDERLOOP) << QSG_RT_PAD << "- window removed";
+            gl->makeCurrent(window);
+            QQuickWindowPrivate::get(window)->fireAboutToStop();
             gl->doneCurrent();
             window = 0;
         }

diff --git a/src/quick/scenegraph/qsgwindowsrenderloop.cpp b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
@@ -209,6 +209,7 @@ void QSGWindowsRenderLoop::hide(QQuickWindow *window)
     QQuickWindowPrivate *cd = QQuickWindowPrivate::get(window);
     m_gl->makeCurrent(window);
     cd->cleanupNodesOnShutdown();
+    cd->fireAboutToStop();
 
     // If this is the last tracked window, check for persistent SG and GL and
     // potentially clean up.