From f16ab166bc7e33c6d4d4aa606618c8ed152608f1 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Mon, 20 Jul 2020 12:37:22 +0200
Subject: QLogging: purge deprecated qInstallMsgHandler(QtMsgHandler)

Deprecated since 5.0.  Renamed a function in a manual test that no
longer needs to say it's Qt5-specific.

Change-Id: I6f2159c702f389d378a0e4d86bd4fe633298b100
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
---
 tests/manual/diaglib/logwidget.cpp            | 23 ++---------------------
 tests/manual/windowflags/controllerwindow.cpp |  4 ----
 2 files changed, 2 insertions(+), 25 deletions(-)

(limited to 'tests/manual')

diff --git a/tests/manual/diaglib/logwidget.cpp b/tests/manual/diaglib/logwidget.cpp
index 4a6348f03a..0089664a60 100644
--- a/tests/manual/diaglib/logwidget.cpp
+++ b/tests/manual/diaglib/logwidget.cpp
@@ -122,36 +122,17 @@ static void messageHandler(QtMsgType type, const QString &text)
     n++;
 }
 
-#if QT_VERSION >= 0x050000
-
-static void qt5MessageHandler(QtMsgType type, const QMessageLogContext &, const QString &text)
+static void qtMessageHandler(QtMsgType type, const QMessageLogContext &, const QString &text)
 { messageHandler(type, text); }
 
 void LogWidget::install()
 {
-    qInstallMessageHandler(qt5MessageHandler);
+    qInstallMessageHandler(qtMessageHandler);
     qInfo("%s", qPrintable(LogWidget::startupMessage()));
 }
 
 void LogWidget::uninstall() { qInstallMessageHandler(nullptr); }
 
-#else // Qt 5
-
-static QtMsgHandler oldHandler = 0;
-
-static void qt4MessageHandler(QtMsgType type, const char *text)
-{ messageHandler(type, QString::fromLocal8Bit(text)); }
-
-void LogWidget::install()
-{
-    oldHandler = qInstallMsgHandler(qt4MessageHandler);
-    qDebug("%s", qPrintable(LogWidget::startupMessage()));
-}
-
-void LogWidget::uninstall() { qInstallMsgHandler(oldHandler); }
-
-#endif // Qt 4
-
 void LogWidget::appendText(const QString &message)
 {
     appendPlainText(message);
diff --git a/tests/manual/windowflags/controllerwindow.cpp b/tests/manual/windowflags/controllerwindow.cpp
index 6334ea588f..5453a0aa75 100644
--- a/tests/manual/windowflags/controllerwindow.cpp
+++ b/tests/manual/windowflags/controllerwindow.cpp
@@ -318,11 +318,7 @@ LogWidget::~LogWidget()
 
 void LogWidget::install()
 {
-#if QT_VERSION >= 0x050000
     qInstallMessageHandler(qt5MessageHandler);
-#else
-    qInstallMsgHandler(qt4MessageHandler);
-#endif
 }
 
 QString LogWidget::startupMessage()
-- 
cgit v1.2.3