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

Change-Id: I47695924b086a2814b532622d96df3096bc1b309
2018-08-21 03:00:39 +02:00 · 2018-08-21 03:00:39 +02:00 · 27d64cde97
commit 27d64cde97
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);