Merge remote-tracking branch 'qt/5.12' into 5.12.5

Conflicts:
	src/client/qwaylandwindow.cpp

Change-Id: I89fefe5bfc247eeaad3981850efa0faaab3cb145

1 files changed, 6 insertions, 2 deletions

diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
index 1d4315a39..f82898bd2 100644
--- a/src/client/qwaylandwindow.cpp
+++ b/src/client/qwaylandwindow.cpp
@@ -211,8 +211,11 @@ void QWaylandWindow::initWindow()
 void QWaylandWindow::initializeWlSurface()
 {
     Q_ASSERT(!isInitialized());
-    QWriteLocker lock(&mSurfaceLock);
-    init(mDisplay->createSurface(static_cast<QtWayland::wl_surface *>(this)));
+    {
+        QWriteLocker lock(&mSurfaceLock);
+        init(mDisplay->createSurface(static_cast<QtWayland::wl_surface *>(this)));
+    }
+    emit wlSurfaceCreated();
 }
 
 bool QWaylandWindow::shouldCreateShellSurface() const
@@ -248,6 +251,7 @@ void QWaylandWindow::reset(bool sendDestroyEvent)
     delete mSubSurfaceWindow;
     mSubSurfaceWindow = nullptr;
     if (isInitialized()) {
+        emit wlSurfaceDestroyed();
         QWriteLocker lock(&mSurfaceLock);
         destroy();
     }