Tools: Use qInstallMessageHandler()

qInstallMsgHandler got deprecated in Qt 5.

Change-Id: Ibff2c3124440e8d9572536167c1c89a05cc20816
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/tools/testcon/mainwindow.cpp b/tools/testcon/mainwindow.cpp
index dab8846..9b28558 100644
--- a/tools/testcon/mainwindow.cpp
+++ b/tools/testcon/mainwindow.cpp
@@ -56,10 +56,10 @@ QAxObject *ax_mainWindow = 0;
 
 static QTextEdit *debuglog = 0;
 
-static void redirectDebugOutput(QtMsgType type, const char*msg)
+static void redirectDebugOutput(QtMsgType type, const QMessageLogContext &, const QString &msg)
 {
     Q_UNUSED(type);
-    debuglog->append(QLatin1String(msg));
+    debuglog->append(msg);
 }
 
 QT_END_NAMESPACE
@@ -80,7 +80,7 @@ MainWindow::MainWindow(QWidget *parent)
     dlgAmbient = 0;
     scripts = 0;
     debuglog = logDebug;
-    oldDebugHandler = qInstallMsgHandler(redirectDebugOutput);
+    oldDebugHandler = qInstallMessageHandler(redirectDebugOutput);
     QHBoxLayout *layout = new QHBoxLayout(Workbase);
     mdiArea = new QMdiArea(Workbase);
     layout->addWidget(mdiArea);
@@ -92,7 +92,7 @@ MainWindow::MainWindow(QWidget *parent)
 
 MainWindow::~MainWindow()
 {
-    qInstallMsgHandler(oldDebugHandler);
+    qInstallMessageHandler(oldDebugHandler);
     debuglog = 0;
 }
 
diff --git a/tools/testcon/mainwindow.h b/tools/testcon/mainwindow.h
index 2a3799c..5a659a8 100644
--- a/tools/testcon/mainwindow.h
+++ b/tools/testcon/mainwindow.h
@@ -94,7 +94,7 @@ private:
     QAxScriptManager *scripts;
     QMdiArea *mdiArea;
 
-    QtMsgHandler oldDebugHandler;
+    QtMessageHandler oldDebugHandler;
 
 private slots:
     void updateGUI();