summaryrefslogtreecommitdiffstats
path: root/tools/testcon/mainwindow.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2015-12-22 13:55:43 +0100
committerFriedemann Kleint <Friedemann.Kleint@theqtcompany.com>2016-01-04 13:33:39 +0000
commitfc55372413a064baa049f28a13cba1406b132cfb (patch)
treea66cf9fdc71963a21344b690a50a8fba794a4145 /tools/testcon/mainwindow.h
parent1091899a3e440d1c46716b3a6f6731bff5555dcd (diff)
testcon: Add option to suppress installation of the message handler.
When debugging controls potentially crashing testcon, it makes sense to use the standard tools to capture debug output. Add an option and move the handler code to main.cpp. Task-number: QTBUG-49712 Change-Id: I9fd60513e7b3e6fc8a20019778a5844ad99d554e Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
Diffstat (limited to 'tools/testcon/mainwindow.h')
-rw-r--r--tools/testcon/mainwindow.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/testcon/mainwindow.h b/tools/testcon/mainwindow.h
index af5454d..a9d15dd 100644
--- a/tools/testcon/mainwindow.h
+++ b/tools/testcon/mainwindow.h
@@ -57,6 +57,8 @@ public:
MainWindow(QWidget *parent = 0);
~MainWindow();
+ static MainWindow *instance() { return m_instance; }
+
bool addControlFromClsid(const QString &clsid);
bool addControlFromFile(const QString &fileName);
bool loadScript(const QString &file);
@@ -64,6 +66,9 @@ public:
protected:
void closeEvent(QCloseEvent *) Q_DECL_OVERRIDE;
+public slots:
+ void appendLogText(const QString &);
+
protected slots:
void on_actionFileNew_triggered();
void on_actionFileLoad_triggered();
@@ -87,6 +92,8 @@ private:
QAxWidget *activeAxWidget() const;
QList<QAxWidget *> axWidgets() const;
+ static MainWindow *m_instance;
+
InvokeMethod *m_dlgInvoke;
ChangeProperties *m_dlgProperties;
AmbientProperties *m_dlgAmbient;