Merge branch 'jb40880' into 'mer-5.6'

Fix crash when a focused window's surface is destroyed. See merge request mer-core/qtbase!35
sailfishos · May 23, 2018 · 11c8f00 · 11c8f00
2 parents 3f59677 + ad9eb80
commit 11c8f00
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
@@ -1651,7 +1651,7 @@ void QWindow::destroy()
     }
 
     if (QGuiApplicationPrivate::focus_window == this)
-        QGuiApplicationPrivate::focus_window = parent();
+        QWindowSystemInterface::handleWindowActivated(parent());
     if (QGuiApplicationPrivate::currentMouseWindow == this)
         QGuiApplicationPrivate::currentMouseWindow = parent();
     if (QGuiApplicationPrivate::currentMousePressWindow == this)