1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: I47695924b086a2814b532622d96df3096bc1b309
This commit is contained in:
Qt Forward Merge Bot 2018-08-21 03:00:39 +02:00
commit 27d64cde97
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -240,6 +240,7 @@ void QWaylandWindow::reset(bool sendDestroyEvent)
mSubSurfaceWindow = nullptr; mSubSurfaceWindow = nullptr;
if (isInitialized()) if (isInitialized())
destroy(); destroy();
mScreens.clear();
if (mFrameCallback) { if (mFrameCallback) {
wl_callback_destroy(mFrameCallback); wl_callback_destroy(mFrameCallback);