summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qplatformwindow.cpp
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>2016-02-01 01:23:54 +0100
committerTor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>2016-02-02 02:12:26 +0000
commitd10bfff89ae103d84a2438d9b8bc6e55ba3b122d (patch)
tree48d7e57ba9dc01561e2ea5e4809b45674f2afae8 /src/gui/kernel/qplatformwindow.cpp
parented2e15780385f7cf0a0d3aedc9cb2059d470bd58 (diff)
Revert "QWindow::destroy(): only reset QGuiApp::focus_window and friends as a last resort"
This reverts commit 4c71db756741d35ccb32dc4c32aa1823264c85df. It's too risky for 5.6, we should let it cook in dev for a while and backport when ready. Change-Id: I91e677e65d967f29c84a254cd3dffc8bb847b263 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
Diffstat (limited to 'src/gui/kernel/qplatformwindow.cpp')
-rw-r--r--src/gui/kernel/qplatformwindow.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp
index fd3ce40342..aea029b7f5 100644
--- a/src/gui/kernel/qplatformwindow.cpp
+++ b/src/gui/kernel/qplatformwindow.cpp
@@ -62,8 +62,6 @@ QPlatformWindow::QPlatformWindow(QWindow *window)
*/
QPlatformWindow::~QPlatformWindow()
{
- // We don't flush window system events here, as the event will be
- // delivered with a platform window that is half-way destroyed.
}
/*!