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>

3 files changed, 2 insertions, 64 deletions

diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
index 6c6f3a2168..a7d7bea6b3 100644
--- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
+++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
@@ -48,10 +48,6 @@ private slots:
 
     void defaultHandler();
     void installMessageHandler();
-#if QT_DEPRECATED_SINCE(5, 0)
-    void installMsgHandler();
-    void installBothHandler();
-#endif
 
 #ifdef QT_BUILD_INTERNAL
     void cleanupFuncinfo_data();
@@ -114,9 +110,6 @@ void tst_qmessagehandler::initTestCase()
 
 void tst_qmessagehandler::cleanup()
 {
-#if QT_DEPRECATED_SINCE(5, 0)
-    qInstallMsgHandler(0);
-#endif
     qInstallMessageHandler((QtMessageHandler)0);
     s_type = QtFatalMsg;
     s_file = 0;
@@ -147,38 +140,6 @@ void tst_qmessagehandler::installMessageHandler()
     QCOMPARE((void*)myHandler, (void*)customMessageHandler);
 }
 
-#if QT_DEPRECATED_SINCE(5, 0)
-void tst_qmessagehandler::installMsgHandler()
-{
-    QtMsgHandler oldHandler = qInstallMsgHandler(customMsgHandler);
-
-    qDebug("installMsgHandler");
-
-    QCOMPARE(s_type, QtDebugMsg);
-    QCOMPARE(s_message, QString::fromLocal8Bit("installMsgHandler"));
-    QCOMPARE(s_file, (const char*)0);
-    QCOMPARE(s_function, (const char*)0);
-    QCOMPARE(s_line, 0);
-
-    QtMsgHandler myHandler = qInstallMsgHandler(oldHandler);
-    QCOMPARE((void*)myHandler, (void*)customMsgHandler);
-}
-
-void tst_qmessagehandler::installBothHandler()
-{
-    qInstallMessageHandler(customMessageHandler);
-    qInstallMsgHandler(customMsgHandler);
-
-    qDebug("installBothHandler"); int line = __LINE__;
-
-    QCOMPARE(s_type, QtDebugMsg);
-    QCOMPARE(s_message, QString::fromLocal8Bit("installBothHandler"));
-    QCOMPARE(s_file, __FILE__);
-    QCOMPARE(s_function, Q_FUNC_INFO);
-    QCOMPARE(s_line, line);
-}
-#endif
-
 # define ADD(x)          QTest::newRow(x) << Q_FUNC_INFO << x;
 
 class TestClass1
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()