path: root/src/gui/kernel/qplatformwindow.cpp
diff options
authorTor Arne Vestbø <>2015-03-12 14:00:52 +0100
committerTor Arne Vestbø <>2016-01-29 19:29:14 +0000
commit4c71db756741d35ccb32dc4c32aa1823264c85df (patch)
tree2c043336b452c689db3eb5549c915520dbd382c4 /src/gui/kernel/qplatformwindow.cpp
parent164c631d807d80a7dc2b19b8c55bc83734be9312 (diff)
QWindow::destroy(): only reset QGuiApp::focus_window and friends as a last resort
Resetting focus_window and other internal QGuiApplication variables before calling setVisible(false) and destroying the platform window means that the platform window can't reason about whether or not it was the focus window unless it can resolve that using native APIs. We should let the platform window take care of resetting the focus window and related states, and only execute our fallback logic if the plugin doesn't do the right thing. We also use QPA to update the state instead of modifying the internal QGuiApplication variables directly, so that events and signals are emitted as a result of the reset. The QLineEdit test gets two added calls to processEvents(), since assuming that activateWindow() is synchronous is not correct, and would result in the QMenu resetting the focus window to 0 on destroy. Task-number: QTBUG-46414 Change-Id: I562788393ed0ffd77d7a4be2279862322f721c1a Reviewed-by: Błażej Szczygieł <> Reviewed-by: Tor Arne Vestbø <>
Diffstat (limited to 'src/gui/kernel/qplatformwindow.cpp')
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index aea029b7f5..fd3ce40342 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -62,6 +62,8 @@ QPlatformWindow::QPlatformWindow(QWindow *window)
+ // We don't flush window system events here, as the event will be
+ // delivered with a platform window that is half-way destroyed.