Merge remote-tracking branch 'origin/5.11' into 5.12

Change-Id: Ib6d23655a5c9ee059a9560e862d38746f508caee
2018-08-25 03:01:39 +02:00 · 2018-08-25 03:01:39 +02:00 · 326ab57d25
commit 326ab57d25
parent 059debd75a e581d7dda4
1 changed files with 1 additions and 0 deletions
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@ -240,6 +240,7 @@ void QWaylandWindow::reset(bool sendDestroyEvent)
    mSubSurfaceWindow = nullptr;
    if (isInitialized())
        destroy();
+    mScreens.clear();

    if (mFrameCallback) {
        wl_callback_destroy(mFrameCallback);