testlib: Rename QAbstractTestLogger::QSystem to QCritical

It's used to handle qCritical() messages, and corresponds to QtMsgType's
QtCriticalMsg, so change its name to reflect what it really is.

In the process, reclassify the -maxwarnings overflow message as a warning,
rather than a critical message.

Pick-to: 6.2
Change-Id: I87626117a547ae4498d5dc352b93bd6db8bfb332
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>

8 files changed, 13 insertions, 13 deletions

diff --git a/src/testlib/qabstracttestlogger.cpp b/src/testlib/qabstracttestlogger.cpp
index c7a0784da7..53b98e9a47 100644
--- a/src/testlib/qabstracttestlogger.cpp
+++ b/src/testlib/qabstracttestlogger.cpp
@@ -135,7 +135,7 @@ void QAbstractTestLogger::addMessage(QtMsgType type, const QMessageLogContext &c
         switch (type) {
         case QtDebugMsg: return QAbstractTestLogger::QDebug;
         case QtInfoMsg: return QAbstractTestLogger::QInfo;
-        case QtCriticalMsg: return QAbstractTestLogger::QSystem;
+        case QtCriticalMsg: return QAbstractTestLogger::QCritical;
         case QtWarningMsg: return QAbstractTestLogger::QWarning;
         case QtFatalMsg: return QAbstractTestLogger::QFatal;
         }
diff --git a/src/testlib/qabstracttestlogger_p.h b/src/testlib/qabstracttestlogger_p.h
index 84803b45c1..c266e5bdda 100644
--- a/src/testlib/qabstracttestlogger_p.h
+++ b/src/testlib/qabstracttestlogger_p.h
@@ -79,7 +79,7 @@ public:
         Warn,
         QWarning,
         QDebug,
-        QSystem,
+        QCritical,
         QFatal,
         Skip,
         Info,
diff --git a/src/testlib/qappletestlogger.cpp b/src/testlib/qappletestlogger.cpp
index dfeadebdef..95798c5361 100644
--- a/src/testlib/qappletestlogger.cpp
+++ b/src/testlib/qappletestlogger.cpp
@@ -149,8 +149,8 @@ void QAppleTestLogger::addMessage(MessageTypes type, const QString &message, con
             return MessageData{QtWarningMsg, nullptr};
         case QAbstractTestLogger::QDebug:
             return MessageData{QtDebugMsg, nullptr};
-        case QAbstractTestLogger::QSystem:
-            return MessageData{QtWarningMsg, "system"};
+        case QAbstractTestLogger::QCritical:
+            return MessageData{QtWarningMsg, "critical"};
         case QAbstractTestLogger::QFatal:
             return MessageData{QtFatalMsg, nullptr};
         case QAbstractTestLogger::Skip:
diff --git a/src/testlib/qjunittestlogger.cpp b/src/testlib/qjunittestlogger.cpp
index 795017ef18..ebb0d9e74d 100644
--- a/src/testlib/qjunittestlogger.cpp
+++ b/src/testlib/qjunittestlogger.cpp
@@ -304,8 +304,8 @@ void QJUnitTestLogger::addMessage(MessageTypes type, const QString &message, con
         systemLogElement = systemErrorElement;
         typeBuf = "warn";
         break;
-    case QAbstractTestLogger::QSystem:
-        typeBuf = "system";
+    case QAbstractTestLogger::QCritical:
+        typeBuf = "qcritical";
         break;
     case QAbstractTestLogger::QDebug:
         typeBuf = "qdebug";
diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp
index 5d9283d8e5..463fae0e34 100644
--- a/src/testlib/qplaintestlogger.cpp
+++ b/src/testlib/qplaintestlogger.cpp
@@ -115,8 +115,8 @@ namespace QTest {
             return "QDEBUG ";
         case QAbstractTestLogger::QInfo:
             return "QINFO  ";
-        case QAbstractTestLogger::QSystem:
-            return "QSYSTEM";
+        case QAbstractTestLogger::QCritical:
+            return "QCRITICAL";
         case QAbstractTestLogger::QFatal:
             return "QFATAL ";
         case QAbstractTestLogger::Info:
diff --git a/src/testlib/qteamcitylogger.cpp b/src/testlib/qteamcitylogger.cpp
index 8a77143454..5ee68af9ad 100644
--- a/src/testlib/qteamcitylogger.cpp
+++ b/src/testlib/qteamcitylogger.cpp
@@ -87,8 +87,8 @@ namespace QTest {
             return "QDEBUG";
         case QAbstractTestLogger::QInfo:
             return "QINFO";
-        case QAbstractTestLogger::QSystem:
-            return "QSYSTEM";
+        case QAbstractTestLogger::QCritical:
+            return "QCRITICAL";
         case QAbstractTestLogger::QFatal:
             return "QFATAL";
         case QAbstractTestLogger::Info:
diff --git a/src/testlib/qtestlog.cpp b/src/testlib/qtestlog.cpp
index 134df48f0f..212dc927a4 100644
--- a/src/testlib/qtestlog.cpp
+++ b/src/testlib/qtestlog.cpp
@@ -223,7 +223,7 @@ namespace QTest {
 
             if (!counter.deref()) {
                 FOREACH_TEST_LOGGER {
-                    logger->addMessage(QAbstractTestLogger::QSystem,
+                    logger->addMessage(QAbstractTestLogger::Warn,
                         QStringLiteral("Maximum amount of warnings exceeded. Use -maxwarnings to override."));
                 }
                 return;
diff --git a/src/testlib/qxmltestlogger.cpp b/src/testlib/qxmltestlogger.cpp
index 763cea327b..46acd883f9 100644
--- a/src/testlib/qxmltestlogger.cpp
+++ b/src/testlib/qxmltestlogger.cpp
@@ -58,8 +58,8 @@ namespace QTest {
         switch (type) {
         case QAbstractTestLogger::Warn:
             return "warn";
-        case QAbstractTestLogger::QSystem:
-            return "system";
+        case QAbstractTestLogger::QCritical:
+            return "qcritical";
         case QAbstractTestLogger::QDebug:
             return "qdebug";
         case QAbstractTestLogger::QInfo: