Merge branch 'close' into 'mer-5.6'

[qtdeclarative] Ask rendering thread to release resources when window is closed. See merge request mer-core/qtdeclarative!25
sailfishos · Apr 16, 2019 · faf3e4b · faf3e4b
2 parents f906aba + a588b2a
commit faf3e4b
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
@@ -1470,6 +1470,14 @@ bool QQuickWindow::event(QEvent *e)
         emit closing(&qev);
         e->setAccepted(qev.isAccepted());
         } break;
+    case QEvent::PlatformSurface:
+        if ((static_cast<QPlatformSurfaceEvent *>(e))->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed) {
+            // Ensure that the rendering thread is notified before
+            // the QPlatformWindow is destroyed.
+            if (d->windowManager)
+                d->windowManager->hide(this);
+        }
+        break;
     case QEvent::FocusAboutToChange:
 #ifndef QT_NO_IM
         if (d->activeFocusItem)