1 files changed, 7 insertions, 7 deletions

diff --git a/src/testlib/qteamcitylogger.cpp b/src/testlib/qteamcitylogger.cpp
index a3e68ff31c..840a0334f6 100644
--- a/src/testlib/qteamcitylogger.cpp
+++ b/src/testlib/qteamcitylogger.cpp
@@ -7,8 +7,8 @@
 #include <QtTest/private/qtestlog_p.h>
 #include <QtTest/private/qteamcitylogger_p.h>
 #include <QtCore/qbytearray.h>
+#include <private/qlocale_p.h>
 
-#include <cctype>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdio.h>
@@ -21,7 +21,7 @@ using namespace Qt::StringLiterals;
 
 namespace QTest {
 
-    static const char *incidentType2String(QAbstractTestLogger::IncidentTypes type)
+    static const char *tcIncidentType2String(QAbstractTestLogger::IncidentTypes type)
     {
         switch (type) {
         case QAbstractTestLogger::Skip:
@@ -46,7 +46,7 @@ namespace QTest {
         return "??????";
     }
 
-    static const char *messageType2String(QAbstractTestLogger::MessageTypes type)
+    static const char *tcMessageType2String(QAbstractTestLogger::MessageTypes type)
     {
         switch (type) {
         case QAbstractTestLogger::QDebug:
@@ -135,7 +135,7 @@ void QTeamCityLogger::addIncident(IncidentTypes type, const char *description,
     }
 
     if (type == QAbstractTestLogger::XFail) {
-        addPendingMessage(QTest::incidentType2String(type), description, file, line);
+        addPendingMessage(QTest::tcIncidentType2String(type), description, file, line);
         return;
     }
 
@@ -197,7 +197,7 @@ void QTeamCityLogger::addMessage(MessageTypes type, const QString &message,
 
     QTestCharBuffer escapedMessage;
     tcEscapedString(&escapedMessage, qUtf8Printable(message));
-    addPendingMessage(QTest::messageType2String(type), escapedMessage.constData(), file, line);
+    addPendingMessage(QTest::tcMessageType2String(type), escapedMessage.constData(), file, line);
 }
 
 void QTeamCityLogger::tcEscapedString(QTestCharBuffer *buf, const char *str) const
@@ -235,7 +235,7 @@ void QTeamCityLogger::tcEscapedString(QTestCharBuffer *buf, const char *str) con
             swallowSpace = false;
             break;
         default:
-            if (std::isspace(ch)) {
+            if (ascii_isspace(ch)) {
                 if (swallowSpace)
                     continue;
                 swallowSpace = true;
@@ -252,7 +252,7 @@ void QTeamCityLogger::tcEscapedString(QTestCharBuffer *buf, const char *str) con
         Q_ASSERT(p[-1] == ' ');
         --p;
     }
-    Q_ASSERT(p == buf->data() || !std::isspace(p[-1]));
+    Q_ASSERT(p == buf->data() || !ascii_isspace(p[-1]));
     *p = '\0';
 }