From e19cea07c1b98eeff3d77cf13abe3a6a482f2cf3 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 5 Jan 2016 14:45:53 +0100 Subject: 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 --- tools/testcon/mainwindow.cpp | 4 ++-- 1 file 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])); -- cgit v1.2.3