diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 13:36:33 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-20 13:36:53 +0100 |
commit | 79ba800108e53b4012e66bbfa93ee12db4815c75 (patch) | |
tree | 3d7794ebbef03c86fb4619b7e514ad64230650a3 /src/quick/scenegraph/qsgwindowsrenderloop.cpp | |
parent | c8a688a56da4404397cb0579715f9db5c53c3540 (diff) | |
parent | 8ae390e75bf589b1591cdf5caa77b254b9ac0d8a (diff) |
Merge remote-tracking branch 'origin/release' into stable
Change-Id: Id732233d56e8d1706f62ef7a153d4a471406c551
Diffstat (limited to 'src/quick/scenegraph/qsgwindowsrenderloop.cpp')
-rw-r--r-- | src/quick/scenegraph/qsgwindowsrenderloop.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/quick/scenegraph/qsgwindowsrenderloop.cpp b/src/quick/scenegraph/qsgwindowsrenderloop.cpp index bcd4f390b4..0c128d5cae 100644 --- a/src/quick/scenegraph/qsgwindowsrenderloop.cpp +++ b/src/quick/scenegraph/qsgwindowsrenderloop.cpp @@ -248,6 +248,7 @@ void QSGWindowsRenderLoop::hide(QQuickWindow *window) if (m_windows.size() == 0) { if (!cd->persistentSceneGraph) { QQuickWindowPrivate::get(window)->context->invalidate(); + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); if (!cd->persistentGLContext) { delete m_gl; m_gl = 0; @@ -264,6 +265,7 @@ void QSGWindowsRenderLoop::windowDestroyed(QQuickWindow *window) // If this is the last tracked window, clean up SG and GL. if (m_windows.size() == 0) { QQuickWindowPrivate::get(window)->context->invalidate(); + QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete); delete m_gl; m_gl = 0; } |