summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-01-05 14:45:53 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-01-05 14:42:00 +0000
commite19cea07c1b98eeff3d77cf13abe3a6a482f2cf3 (patch)
tree570a74b944b5761bd841563c0512ce31120b5959 /tools
parentfc55372413a064baa049f28a13cba1406b132cfb (diff)
downloadqtactiveqt-e19cea07c1b98eeff3d77cf13abe3a6a482f2cf3.tar.gz
testcon: Set MainWindow instance pointer after setupUi().
Otherwise, the application crashes when debug messages are emitted while creating window. Amends fc55372413a064baa049f28a13cba1406b132cfb. Task-number: QTBUG-49712 Change-Id: I393d46431fbafb6aab95866848466dc72820fa89 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/testcon/mainwindow.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp
index e4587be..98550ab 100644
--- a/tools/testcon/mainwindow.cpp
+++ b/tools/testcon/mainwindow.cpp
@@ -76,9 +76,9 @@ MainWindow::MainWindow(QWidget *parent)
, m_dlgAmbient(Q_NULLPTR)
, m_scripts(Q_NULLPTR)
{
- MainWindow::m_instance = this;
-
setupUi(this);
+ MainWindow::m_instance = this; // Logging handler needs the UI
+
setObjectName(QLatin1String("MainWindow"));
const int scriptCount = int(sizeof(scriptLanguages) / sizeof(scriptLanguages[0]));