summaryrefslogtreecommitdiffstats
path: root/tools/testcon/mainwindow.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-12-22 12:42:14 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-12-22 12:16:41 +0000
commit1091899a3e440d1c46716b3a6f6731bff5555dcd (patch)
tree46ae0fce6167ca40259362f00b65667287fe0323 /tools/testcon/mainwindow.h
parent645315c060c75d0d212c0339c17a1e0e6ac9632b (diff)
testcon: Fix hangs when closing the window.
When loading controls using the same version of Qt, QGuiApplication::quitOnLastWindowClosed is set to false. Overwrite MainWindow::closeEvent() to fix this. Task-number: QTBUG-49712 Change-Id: I7425cf2a4a70353e017ed5cad463e1b66b819247 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tools/testcon/mainwindow.h')
-rw-r--r--tools/testcon/mainwindow.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/testcon/mainwindow.h b/tools/testcon/mainwindow.h
index cc0f361..af5454d 100644
--- a/tools/testcon/mainwindow.h
+++ b/tools/testcon/mainwindow.h
@@ -61,6 +61,9 @@ public:
bool addControlFromFile(const QString &fileName);
bool loadScript(const QString &file);
+protected:
+ void closeEvent(QCloseEvent *) Q_DECL_OVERRIDE;
+
protected slots:
void on_actionFileNew_triggered();
void on_actionFileLoad_triggered();