1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp
index ab274ed4af..82059e9289 100644
--- a/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp
+++ b/src/plugins/scenegraph/softwarecontext/threadedrenderloop.cpp
@@ -339,7 +339,10 @@ bool RenderThread::event(QEvent *e)
 
         mutex.lock();
         if (window) {
-            QQuickWindowPrivate::get(window)->fireAboutToStop();
+            QQuickWindowPrivate *d = QQuickWindowPrivate::get(window);
+            d->fireAboutToStop();
+            d->cleanupNodesOnShutdown();
+
             qCDebug(QSG_RASTER_LOG_RENDERLOOP) << QSG_RT_PAD << "- window removed";
             window = 0;
         }