Remove trailing space from QDebug stream

It's unexpected that all messages generated by the stream version
of qDebug and friends have a trailing space. It also makes switching
to categorized logging (which only supports the stream version) difficult,
since all autotests checking for debug output would have to be adapted.

Task-number: QTBUG-15256
Change-Id: I8d627a8379dc273d9689f5611184f03607b73823
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

28 files changed, 383 insertions, 383 deletions

diff --git a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
index 31a4254344..21e07630e2 100644
--- a/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
+++ b/tests/auto/corelib/global/qlogging/tst_qlogging.cpp
@@ -672,7 +672,7 @@ void tst_qmessagehandler::qMessagePattern()
     QVERIFY(output.contains("debug tst_qlogging 57 main qDebug"));
     QVERIFY(output.contains("warning tst_qlogging 58 main qWarning"));
     QVERIFY(output.contains("critical tst_qlogging 59 main qCritical"));
-    QVERIFY(output.contains("warning tst_qlogging 62 main qDebug with category "));
+    QVERIFY(output.contains("warning tst_qlogging 62 main qDebug with category"));
     QVERIFY(output.contains("debug tst_qlogging 66 main qDebug2"));
 
     environment = m_baseEnvironment;
@@ -712,7 +712,7 @@ void tst_qmessagehandler::qMessagePattern()
             "[debug] qDebug\n"
             "[warning] qWarning\n"
             "[critical] qCritical\n"
-            "[warning] qDebug with category \n";
+            "[warning] qDebug with category\n";
 #ifdef Q_OS_WIN
     output.replace("\r\n", "\n");
 #endif
diff --git a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
index f452efc1b3..29c7e6a81e 100644
--- a/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
+++ b/tests/auto/corelib/io/qdebug/tst_qdebug.cpp
@@ -65,8 +65,8 @@ void tst_QDebug::assignment() const
     QDebug debug1(QtDebugMsg);
     QDebug debug2(QtWarningMsg);
 
-    QTest::ignoreMessage(QtDebugMsg, "foo ");
-    QTest::ignoreMessage(QtWarningMsg, "bar 1 2 ");
+    QTest::ignoreMessage(QtDebugMsg, "foo");
+    QTest::ignoreMessage(QtWarningMsg, "bar 1 2");
 
     debug1 << "foo";
     debug2 << "bar";
@@ -118,7 +118,7 @@ void tst_QDebug::warningWithoutDebug() const
     { qWarning() << "A qWarning() message"; }
     QString file = __FILE__; int line = __LINE__ - 1; QString function = Q_FUNC_INFO;
     QCOMPARE(s_msgType, QtWarningMsg);
-    QCOMPARE(s_msg, QString::fromLatin1("A qWarning() message "));
+    QCOMPARE(s_msg, QString::fromLatin1("A qWarning() message"));
     QCOMPARE(QString::fromLatin1(s_file), file);
     QCOMPARE(s_line, line);
     QCOMPARE(QString::fromLatin1(s_function), function);
@@ -133,7 +133,7 @@ void tst_QDebug::criticalWithoutDebug() const
     { qCritical() << "A qCritical() message"; }
     QString file = __FILE__; int line = __LINE__ - 1; QString function = Q_FUNC_INFO;
     QCOMPARE(s_msgType, QtCriticalMsg);
-    QCOMPARE(s_msg, QString::fromLatin1("A qCritical() message "));
+    QCOMPARE(s_msg, QString::fromLatin1("A qCritical() message"));
     QCOMPARE(QString::fromLatin1(s_file), file);
     QCOMPARE(s_line, line);
     QCOMPARE(QString::fromLatin1(s_function), function);
@@ -145,7 +145,7 @@ void tst_QDebug::debugWithBool() const
     { qDebug() << false << true; }
     QString file = __FILE__; int line = __LINE__ - 1; QString function = Q_FUNC_INFO;
     QCOMPARE(s_msgType, QtDebugMsg);
-    QCOMPARE(s_msg, QString::fromLatin1("false true "));
+    QCOMPARE(s_msg, QString::fromLatin1("false true"));
     QCOMPARE(QString::fromLatin1(s_file), file);
     QCOMPARE(s_line, line);
     QCOMPARE(QString::fromLatin1(s_function), function);
@@ -215,7 +215,7 @@ void tst_QDebug::stateSaver() const
         }
         d.space() << 42;
     }
-    QCOMPARE(s_msg, QString::fromLatin1("02a 42 "));
+    QCOMPARE(s_msg, QString::fromLatin1("02a 42"));
 }
 
 void tst_QDebug::veryLongWarningMessage() const
@@ -247,7 +247,7 @@ void tst_QDebug::qDebugQStringRef() const
         { qDebug() << inRef; }
         QString file = __FILE__; int line = __LINE__ - 1; QString function = Q_FUNC_INFO;
         QCOMPARE(s_msgType, QtDebugMsg);
-        QCOMPARE(s_msg, QString::fromLatin1("\"input\" "));
+        QCOMPARE(s_msg, QString::fromLatin1("\"input\""));
         QCOMPARE(QString::fromLatin1(s_file), file);
         QCOMPARE(s_line, line);
         QCOMPARE(QString::fromLatin1(s_function), function);
@@ -261,7 +261,7 @@ void tst_QDebug::qDebugQStringRef() const
         { qDebug() << inRef; }
         QString file = __FILE__; int line = __LINE__ - 1; QString function = Q_FUNC_INFO;
         QCOMPARE(s_msgType, QtDebugMsg);
-        QCOMPARE(s_msg, QString::fromLatin1("\"\" "));
+        QCOMPARE(s_msg, QString::fromLatin1("\"\""));
         QCOMPARE(QString::fromLatin1(s_file), file);
         QCOMPARE(s_line, line);
         QCOMPARE(QString::fromLatin1(s_function), function);
@@ -274,7 +274,7 @@ void tst_QDebug::qDebugQLatin1String() const
     { qDebug() << QLatin1String("foo") << QLatin1String("") << QLatin1String("barbaz", 3); }
     QString file = __FILE__; int line = __LINE__ - 1; QString function = Q_FUNC_INFO;
     QCOMPARE(s_msgType, QtDebugMsg);
-    QCOMPARE(s_msg, QString::fromLatin1("\"foo\" \"\" \"bar\" "));
+    QCOMPARE(s_msg, QString::fromLatin1("\"foo\" \"\" \"bar\""));
     QCOMPARE(QString::fromLatin1(s_file), file);
     QCOMPARE(s_line, line);
     QCOMPARE(QString::fromLatin1(s_function), function);
diff --git a/tests/auto/corelib/io/qnodebug/tst_qnodebug.cpp b/tests/auto/corelib/io/qnodebug/tst_qnodebug.cpp
index 157e42b447..a516b762f7 100644
--- a/tests/auto/corelib/io/qnodebug/tst_qnodebug.cpp
+++ b/tests/auto/corelib/io/qnodebug/tst_qnodebug.cpp
@@ -68,8 +68,8 @@ void tst_QNoDebug::noDebugOutput() const
     qCDebug(cat) << "foo";
 
     // qWarning still works, though
-    QTest::ignoreMessage(QtWarningMsg, "bar ");
-    QTest::ignoreMessage(QtWarningMsg, "custom-bar ");
+    QTest::ignoreMessage(QtWarningMsg, "bar");
+    QTest::ignoreMessage(QtWarningMsg, "custom-bar");
     qWarning() << "bar";
     qCWarning(cat) << "custom-bar";
 }
@@ -79,7 +79,7 @@ void tst_QNoDebug::streaming() const
     QDateTime dt(QDate(1,2,3),QTime(4,5,6));
     QString debugString = dt.toString(QStringLiteral("yyyy-MM-dd HH:mm:ss.zzz t"))
                         + QStringLiteral(" Qt::LocalTime");
-    QTest::ignoreMessage(QtWarningMsg, qPrintable(QString::fromLatin1("QDateTime(\"%1\") ").arg(debugString)));
+    QTest::ignoreMessage(QtWarningMsg, qPrintable(QString::fromLatin1("QDateTime(\"%1\")").arg(debugString)));
     qWarning() << dt;
 }
 
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
index 923b9a3a07..bb77ec54c5 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
@@ -2740,9 +2740,9 @@ void tst_QSortFilterProxyModel::mapFromToSource()
     QCOMPARE(proxy.mapToSource(QModelIndex()), QModelIndex());
 
 #ifdef QT_NO_DEBUG  //if Qt is compiled in debug mode, this will assert
-    QTest::ignoreMessage(QtWarningMsg, "QSortFilterProxyModel: index from wrong model passed to mapToSource ");
+    QTest::ignoreMessage(QtWarningMsg, "QSortFilterProxyModel: index from wrong model passed to mapToSource");
     QCOMPARE(proxy.mapToSource(source.index(2, 3)), QModelIndex());
-    QTest::ignoreMessage(QtWarningMsg, "QSortFilterProxyModel: index from wrong model passed to mapFromSource ");
+    QTest::ignoreMessage(QtWarningMsg, "QSortFilterProxyModel: index from wrong model passed to mapFromSource");
     QCOMPARE(proxy.mapFromSource(proxy.index(6, 2)), QModelIndex());
 #endif
 }
diff --git a/tests/auto/corelib/json/tst_qtjson.cpp b/tests/auto/corelib/json/tst_qtjson.cpp
index c79e7273c0..a8534bf6f0 100644
--- a/tests/auto/corelib/json/tst_qtjson.cpp
+++ b/tests/auto/corelib/json/tst_qtjson.cpp
@@ -1985,11 +1985,11 @@ void tst_QtJson::testDebugStream()
         // QJsonObject
 
         QJsonObject object;
-        QTest::ignoreMessage(QtDebugMsg, "QJsonObject() ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonObject()");
         qDebug() << object;
 
         object.insert(QLatin1String("foo"), QLatin1String("bar"));
-        QTest::ignoreMessage(QtDebugMsg, "QJsonObject({\"foo\": \"bar\"}) ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonObject({\"foo\": \"bar\"})");
         qDebug() << object;
     }
 
@@ -1997,12 +1997,12 @@ void tst_QtJson::testDebugStream()
         // QJsonArray
 
         QJsonArray array;
-        QTest::ignoreMessage(QtDebugMsg, "QJsonArray() ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonArray()");
         qDebug() << array;
 
         array.append(1);
         array.append(QLatin1String("foo"));
-        QTest::ignoreMessage(QtDebugMsg, "QJsonArray([1,\"foo\"]) ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonArray([1,\"foo\"])");
         qDebug() << array;
     }
 
@@ -2010,19 +2010,19 @@ void tst_QtJson::testDebugStream()
         // QJsonDocument
 
         QJsonDocument doc;
-        QTest::ignoreMessage(QtDebugMsg, "QJsonDocument() ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonDocument()");
         qDebug() << doc;
 
         QJsonObject object;
         object.insert(QLatin1String("foo"), QLatin1String("bar"));
         doc.setObject(object);
-        QTest::ignoreMessage(QtDebugMsg, "QJsonDocument({\"foo\": \"bar\"}) ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonDocument({\"foo\": \"bar\"})");
         qDebug() << doc;
 
         QJsonArray array;
         array.append(1);
         array.append(QLatin1String("foo"));
-        QTest::ignoreMessage(QtDebugMsg, "QJsonDocument([1,\"foo\"]) ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonDocument([1,\"foo\"])");
         doc.setArray(array);
         qDebug() << doc;
     }
@@ -2032,36 +2032,36 @@ void tst_QtJson::testDebugStream()
 
         QJsonValue value;
 
-        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(null) ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(null)");
         qDebug() << value;
 
         value = QJsonValue(true); // bool
-        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(bool, true) ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(bool, true)");
         qDebug() << value;
 
         value = QJsonValue((double)4.2); // double
-        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(double, 4.2) ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(double, 4.2)");
         qDebug() << value;
 
         value = QJsonValue((int)42); // int
-        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(double, 42) ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(double, 42)");
         qDebug() << value;
 
         value = QJsonValue(QLatin1String("foo")); // string
-        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(string, \"foo\") ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(string, \"foo\")");
         qDebug() << value;
 
         QJsonArray array;
         array.append(1);
         array.append(QLatin1String("foo"));
         value = QJsonValue(array); // array
-        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(array, QJsonArray([1,\"foo\"]) ) ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(array, QJsonArray([1,\"foo\"]) )");
         qDebug() << value;
 
         QJsonObject object;
         object.insert(QLatin1String("foo"), QLatin1String("bar"));
         value = QJsonValue(object); // object
-        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(object, QJsonObject({\"foo\": \"bar\"}) ) ");
+        QTest::ignoreMessage(QtDebugMsg, "QJsonValue(object, QJsonObject({\"foo\": \"bar\"}) )");
         qDebug() << value;
     }
 }
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index e4804e6079..6e8de2721e 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -454,7 +454,7 @@ void tst_QObject::connectSlotsByName()
     sender.setObjectName("Sender");
 
     QTest::ignoreMessage(QtWarningMsg, "QMetaObject::connectSlotsByName: No matching signal for on_child_signal()");
-    QTest::ignoreMessage(QtWarningMsg, "QMetaObject::connectSlotsByName: Connecting slot on_Sender_signalManyParams() with the first of the following compatible signals: (\"signalManyParams(int,int,int,QString,bool)\", \"signalManyParams(int,int,int,QString,bool,bool)\") ");
+    QTest::ignoreMessage(QtWarningMsg, "QMetaObject::connectSlotsByName: Connecting slot on_Sender_signalManyParams() with the first of the following compatible signals: (\"signalManyParams(int,int,int,QString,bool)\", \"signalManyParams(int,int,int,QString,bool,bool)\")");
     QMetaObject::connectSlotsByName(&receiver);
 
     receiver.called_slots.clear();
diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
index 9887acf7dd..6053021cf4 100644
--- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
+++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp
@@ -1026,7 +1026,7 @@ void tst_QLocalSocket::writeToClientAndDisconnect()
 void tst_QLocalSocket::debug()
 {
     // Make sure this compiles
-    QTest::ignoreMessage(QtDebugMsg, "QLocalSocket::ConnectionRefusedError QLocalSocket::UnconnectedState ");
+    QTest::ignoreMessage(QtDebugMsg, "QLocalSocket::ConnectionRefusedError QLocalSocket::UnconnectedState");
     qDebug() << QLocalSocket::ConnectionRefusedError << QLocalSocket::UnconnectedState;
 }
 
diff --git a/tests/auto/other/qvariant_common/tst_qvariant_common.h b/tests/auto/other/qvariant_common/tst_qvariant_common.h
index fc3eff4b91..7a34d7b0c2 100644
--- a/tests/auto/other/qvariant_common/tst_qvariant_common.h
+++ b/tests/auto/other/qvariant_common/tst_qvariant_common.h
@@ -107,7 +107,7 @@ protected:
             currentName.chop(1);
             ok &= (msg.contains(", " + currentName) || msg.contains(", 0x0"));
         }
-        ok &= msg.endsWith(") ");
+        ok &= msg.endsWith(")");
         QVERIFY2(ok, (QString::fromLatin1("Message is not correctly finished: '") + msg + '\'').toLatin1().constData());
 
     }
diff --git a/tests/auto/testlib/selftests/expected_counting.lightxml b/tests/auto/testlib/selftests/expected_counting.lightxml
index c49792fec4..799a7d7b17 100644
--- a/tests/auto/testlib/selftests/expected_counting.lightxml
+++ b/tests/auto/testlib/selftests/expected_counting.lightxml
@@ -107,7 +107,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[fail]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description>
 </Message>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242">
     <DataTag><![CDATA[fail]]></DataTag>
@@ -135,7 +135,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244">
     <DataTag><![CDATA[skip]]></DataTag>
diff --git a/tests/auto/testlib/selftests/expected_counting.txt b/tests/auto/testlib/selftests/expected_counting.txt
index f413882c2a..51b9402d3a 100644
--- a/tests/auto/testlib/selftests/expected_counting.txt
+++ b/tests/auto/testlib/selftests/expected_counting.txt
@@ -36,7 +36,7 @@ FAIL!  : tst_Counting::testFailInInit(fail) Fail in init()
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(234)]
 PASS   : tst_Counting::testFailInInit(after)
 PASS   : tst_Counting::testFailInCleanup(before)
-QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() 
+QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup()
 FAIL!  : tst_Counting::testFailInCleanup(fail) Fail in cleanup()
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(242)]
 PASS   : tst_Counting::testFailInCleanup(after)
@@ -45,7 +45,7 @@ SKIP   : tst_Counting::testSkipInInit(skip) Skip in init()
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(236)]
 PASS   : tst_Counting::testSkipInInit(after)
 PASS   : tst_Counting::testSkipInCleanup(before)
-QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() 
+QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup()
 SKIP   : tst_Counting::testSkipInCleanup(skip) Skip in cleanup()
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(244)]
 PASS   : tst_Counting::testSkipInCleanup(after)
diff --git a/tests/auto/testlib/selftests/expected_counting.xml b/tests/auto/testlib/selftests/expected_counting.xml
index 7caa915f65..8177a2dc7f 100644
--- a/tests/auto/testlib/selftests/expected_counting.xml
+++ b/tests/auto/testlib/selftests/expected_counting.xml
@@ -109,7 +109,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[fail]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description>
 </Message>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242">
     <DataTag><![CDATA[fail]]></DataTag>
@@ -137,7 +137,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244">
     <DataTag><![CDATA[skip]]></DataTag>
diff --git a/tests/auto/testlib/selftests/expected_counting.xunitxml b/tests/auto/testlib/selftests/expected_counting.xunitxml
index f317ed5923..72bf047ba8 100644
--- a/tests/auto/testlib/selftests/expected_counting.xunitxml
+++ b/tests/auto/testlib/selftests/expected_counting.xunitxml
@@ -38,14 +38,14 @@
     <failure tag="fail" message="Fail in init()" result="fail"/>
   </testcase>
   <testcase result="fail" name="testFailInCleanup">
-    <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup() " type="qdebug" -->
+    <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup()" type="qdebug" -->
     <failure tag="fail" message="Fail in cleanup()" result="fail"/>
   </testcase>
   <testcase result="pass" name="testSkipInInit">
     <!-- tag="skip" message="Skip in init()" type="skip" -->
   </testcase>
   <testcase result="pass" name="testSkipInCleanup">
-    <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup() " type="qdebug" -->
+    <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup()" type="qdebug" -->
     <!-- tag="skip" message="Skip in cleanup()" type="skip" -->
   </testcase>
   <testcase result="pass" name="cleanupTestCase"/>
@@ -56,9 +56,9 @@
 <![CDATA[Skipping]]>
 <![CDATA[Skipping]]>
 <![CDATA[Skipping]]>
-<![CDATA[This test function should execute and then QFAIL in cleanup() ]]>
+<![CDATA[This test function should execute and then QFAIL in cleanup()]]>
 <![CDATA[Skip in init()]]>
-<![CDATA[This test function should execute and then QSKIP in cleanup() ]]>
+<![CDATA[This test function should execute and then QSKIP in cleanup()]]>
 <![CDATA[Skip in cleanup()]]>
   </system-err>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.lightxml b/tests/auto/testlib/selftests/expected_globaldata.lightxml
index 6d68bfbdb5..0fc9d527fb 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.lightxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.lightxml
@@ -4,83 +4,83 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[initTestCase initTestCase (null) ]]></Description>
+    <Description><![CDATA[initTestCase initTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
 <TestFunction name="testGlobal">
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1 ]]></Description>
+    <Description><![CDATA[init testGlobal local 1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[global: false ]]></Description>
+    <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[local: false ]]></Description>
+    <Description><![CDATA[local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 1 ]]></Description>
+    <Description><![CDATA[cleanup testGlobal local 1]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2 ]]></Description>
+    <Description><![CDATA[init testGlobal local 2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[global: false ]]></Description>
+    <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[local: true ]]></Description>
+    <Description><![CDATA[local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 2 ]]></Description>
+    <Description><![CDATA[cleanup testGlobal local 2]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1 ]]></Description>
+    <Description><![CDATA[init testGlobal local 1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[global: true ]]></Description>
+    <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[local: false ]]></Description>
+    <Description><![CDATA[local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 1 ]]></Description>
+    <Description><![CDATA[cleanup testGlobal local 1]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2 ]]></Description>
+    <Description><![CDATA[init testGlobal local 2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[global: true ]]></Description>
+    <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[local: true ]]></Description>
+    <Description><![CDATA[local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 2 ]]></Description>
+    <Description><![CDATA[cleanup testGlobal local 2]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
@@ -95,7 +95,7 @@
 <TestFunction name="skipLocal">
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipLocal local 1 ]]></Description>
+    <Description><![CDATA[init skipLocal local 1]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="149">
     <DataTag><![CDATA[1:local 1]]></DataTag>
@@ -103,11 +103,11 @@
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 1 ]]></Description>
+    <Description><![CDATA[cleanup skipLocal local 1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipLocal local 2 ]]></Description>
+    <Description><![CDATA[init skipLocal local 2]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="149">
     <DataTag><![CDATA[1:local 2]]></DataTag>
@@ -115,43 +115,43 @@
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 2 ]]></Description>
+    <Description><![CDATA[cleanup skipLocal local 2]]></Description>
 </Message>
 </TestFunction>
 <TestFunction name="skipSingle">
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipSingle local 1 ]]></Description>
+    <Description><![CDATA[init skipSingle local 1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[global: false local: false ]]></Description>
+    <Description><![CDATA[global: false local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 1 ]]></Description>
+    <Description><![CDATA[cleanup skipSingle local 1]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2 ]]></Description>
+    <Description><![CDATA[init skipSingle local 2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[global: false local: true ]]></Description>
+    <Description><![CDATA[global: false local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 2 ]]></Description>
+    <Description><![CDATA[cleanup skipSingle local 2]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[init skipSingle local 1 ]]></Description>
+    <Description><![CDATA[init skipSingle local 1]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="143">
     <DataTag><![CDATA[2:local 1]]></DataTag>
@@ -159,19 +159,19 @@
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 1 ]]></Description>
+    <Description><![CDATA[cleanup skipSingle local 1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2 ]]></Description>
+    <Description><![CDATA[init skipSingle local 2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[global: true local: true ]]></Description>
+    <Description><![CDATA[global: true local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 2 ]]></Description>
+    <Description><![CDATA[cleanup skipSingle local 2]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
@@ -179,7 +179,7 @@
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[cleanupTestCase cleanupTestCase (null) ]]></Description>
+    <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.txt b/tests/auto/testlib/selftests/expected_globaldata.txt
index e5d9cacc9c..4e3544dbe0 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.txt
+++ b/tests/auto/testlib/selftests/expected_globaldata.txt
@@ -1,54 +1,54 @@
 ********* Start testing of tst_globaldata *********
 Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
-QDEBUG : tst_globaldata::initTestCase() initTestCase initTestCase (null) 
+QDEBUG : tst_globaldata::initTestCase() initTestCase initTestCase (null)
 PASS   : tst_globaldata::initTestCase()
-QDEBUG : tst_globaldata::testGlobal(1:local 1) init testGlobal local 1 
-QDEBUG : tst_globaldata::testGlobal(1:local 1) global: false 
-QDEBUG : tst_globaldata::testGlobal(1:local 1) local: false 
-QDEBUG : tst_globaldata::testGlobal(1:local 1) cleanup testGlobal local 1 
+QDEBUG : tst_globaldata::testGlobal(1:local 1) init testGlobal local 1
+QDEBUG : tst_globaldata::testGlobal(1:local 1) global: false
+QDEBUG : tst_globaldata::testGlobal(1:local 1) local: false
+QDEBUG : tst_globaldata::testGlobal(1:local 1) cleanup testGlobal local 1
 PASS   : tst_globaldata::testGlobal(1:local 1)
-QDEBUG : tst_globaldata::testGlobal(1:local 2) init testGlobal local 2 
-QDEBUG : tst_globaldata::testGlobal(1:local 2) global: false 
-QDEBUG : tst_globaldata::testGlobal(1:local 2) local: true 
-QDEBUG : tst_globaldata::testGlobal(1:local 2) cleanup testGlobal local 2 
+QDEBUG : tst_globaldata::testGlobal(1:local 2) init testGlobal local 2
+QDEBUG : tst_globaldata::testGlobal(1:local 2) global: false
+QDEBUG : tst_globaldata::testGlobal(1:local 2) local: true
+QDEBUG : tst_globaldata::testGlobal(1:local 2) cleanup testGlobal local 2
 PASS   : tst_globaldata::testGlobal(1:local 2)
-QDEBUG : tst_globaldata::testGlobal(2:local 1) init testGlobal local 1 
-QDEBUG : tst_globaldata::testGlobal(2:local 1) global: true 
-QDEBUG : tst_globaldata::testGlobal(2:local 1) local: false 
-QDEBUG : tst_globaldata::testGlobal(2:local 1) cleanup testGlobal local 1 
+QDEBUG : tst_globaldata::testGlobal(2:local 1) init testGlobal local 1
+QDEBUG : tst_globaldata::testGlobal(2:local 1) global: true
+QDEBUG : tst_globaldata::testGlobal(2:local 1) local: false
+QDEBUG : tst_globaldata::testGlobal(2:local 1) cleanup testGlobal local 1
 PASS   : tst_globaldata::testGlobal(2:local 1)
-QDEBUG : tst_globaldata::testGlobal(2:local 2) init testGlobal local 2 
-QDEBUG : tst_globaldata::testGlobal(2:local 2) global: true 
-QDEBUG : tst_globaldata::testGlobal(2:local 2) local: true 
-QDEBUG : tst_globaldata::testGlobal(2:local 2) cleanup testGlobal local 2 
+QDEBUG : tst_globaldata::testGlobal(2:local 2) init testGlobal local 2
+QDEBUG : tst_globaldata::testGlobal(2:local 2) global: true
+QDEBUG : tst_globaldata::testGlobal(2:local 2) local: true
+QDEBUG : tst_globaldata::testGlobal(2:local 2) cleanup testGlobal local 2
 PASS   : tst_globaldata::testGlobal(2:local 2)
 SKIP   : tst_globaldata::skip(1) skipping
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(129)]
-QDEBUG : tst_globaldata::skipLocal(1:local 1) init skipLocal local 1 
+QDEBUG : tst_globaldata::skipLocal(1:local 1) init skipLocal local 1
 SKIP   : tst_globaldata::skipLocal(1:local 1) skipping
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(149)]
-QDEBUG : tst_globaldata::skipLocal(1:local 1) cleanup skipLocal local 1 
-QDEBUG : tst_globaldata::skipLocal(1:local 2) init skipLocal local 2 
+QDEBUG : tst_globaldata::skipLocal(1:local 1) cleanup skipLocal local 1
+QDEBUG : tst_globaldata::skipLocal(1:local 2) init skipLocal local 2
 SKIP   : tst_globaldata::skipLocal(1:local 2) skipping
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(149)]
-QDEBUG : tst_globaldata::skipLocal(1:local 2) cleanup skipLocal local 2 
-QDEBUG : tst_globaldata::skipSingle(1:local 1) init skipSingle local 1 
-QDEBUG : tst_globaldata::skipSingle(1:local 1) global: false local: false 
-QDEBUG : tst_globaldata::skipSingle(1:local 1) cleanup skipSingle local 1 
+QDEBUG : tst_globaldata::skipLocal(1:local 2) cleanup skipLocal local 2
+QDEBUG : tst_globaldata::skipSingle(1:local 1) init skipSingle local 1
+QDEBUG : tst_globaldata::skipSingle(1:local 1) global: false local: false
+QDEBUG : tst_globaldata::skipSingle(1:local 1) cleanup skipSingle local 1
 PASS   : tst_globaldata::skipSingle(1:local 1)
-QDEBUG : tst_globaldata::skipSingle(1:local 2) init skipSingle local 2 
-QDEBUG : tst_globaldata::skipSingle(1:local 2) global: false local: true 
-QDEBUG : tst_globaldata::skipSingle(1:local 2) cleanup skipSingle local 2 
+QDEBUG : tst_globaldata::skipSingle(1:local 2) init skipSingle local 2
+QDEBUG : tst_globaldata::skipSingle(1:local 2) global: false local: true
+QDEBUG : tst_globaldata::skipSingle(1:local 2) cleanup skipSingle local 2
 PASS   : tst_globaldata::skipSingle(1:local 2)
-QDEBUG : tst_globaldata::skipSingle(2:local 1) init skipSingle local 1 
+QDEBUG : tst_globaldata::skipSingle(2:local 1) init skipSingle local 1
 SKIP   : tst_globaldata::skipSingle(2:local 1) skipping
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(143)]
-QDEBUG : tst_globaldata::skipSingle(2:local 1) cleanup skipSingle local 1 
-QDEBUG : tst_globaldata::skipSingle(2:local 2) init skipSingle local 2 
-QDEBUG : tst_globaldata::skipSingle(2:local 2) global: true local: true 
-QDEBUG : tst_globaldata::skipSingle(2:local 2) cleanup skipSingle local 2 
+QDEBUG : tst_globaldata::skipSingle(2:local 1) cleanup skipSingle local 1
+QDEBUG : tst_globaldata::skipSingle(2:local 2) init skipSingle local 2
+QDEBUG : tst_globaldata::skipSingle(2:local 2) global: true local: true
+QDEBUG : tst_globaldata::skipSingle(2:local 2) cleanup skipSingle local 2
 PASS   : tst_globaldata::skipSingle(2:local 2)
-QDEBUG : tst_globaldata::cleanupTestCase() cleanupTestCase cleanupTestCase (null) 
+QDEBUG : tst_globaldata::cleanupTestCase() cleanupTestCase cleanupTestCase (null)
 PASS   : tst_globaldata::cleanupTestCase()
 Totals: 9 passed, 0 failed, 4 skipped
 ********* Finished testing of tst_globaldata *********
diff --git a/tests/auto/testlib/selftests/expected_globaldata.xml b/tests/auto/testlib/selftests/expected_globaldata.xml
index 906e66ca68..cf2534e34a 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.xml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xml
@@ -6,83 +6,83 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[initTestCase initTestCase (null) ]]></Description>
+    <Description><![CDATA[initTestCase initTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
 <TestFunction name="testGlobal">
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1 ]]></Description>
+    <Description><![CDATA[init testGlobal local 1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[global: false ]]></Description>
+    <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[local: false ]]></Description>
+    <Description><![CDATA[local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 1 ]]></Description>
+    <Description><![CDATA[cleanup testGlobal local 1]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2 ]]></Description>
+    <Description><![CDATA[init testGlobal local 2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[global: false ]]></Description>
+    <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[local: true ]]></Description>
+    <Description><![CDATA[local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 2 ]]></Description>
+    <Description><![CDATA[cleanup testGlobal local 2]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1 ]]></Description>
+    <Description><![CDATA[init testGlobal local 1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[global: true ]]></Description>
+    <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[local: false ]]></Description>
+    <Description><![CDATA[local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 1 ]]></Description>
+    <Description><![CDATA[cleanup testGlobal local 1]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2 ]]></Description>
+    <Description><![CDATA[init testGlobal local 2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[global: true ]]></Description>
+    <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[local: true ]]></Description>
+    <Description><![CDATA[local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[cleanup testGlobal local 2 ]]></Description>
+    <Description><![CDATA[cleanup testGlobal local 2]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
@@ -97,7 +97,7 @@
 <TestFunction name="skipLocal">
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipLocal local 1 ]]></Description>
+    <Description><![CDATA[init skipLocal local 1]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="149">
     <DataTag><![CDATA[1:local 1]]></DataTag>
@@ -105,11 +105,11 @@
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 1 ]]></Description>
+    <Description><![CDATA[cleanup skipLocal local 1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipLocal local 2 ]]></Description>
+    <Description><![CDATA[init skipLocal local 2]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="149">
     <DataTag><![CDATA[1:local 2]]></DataTag>
@@ -117,43 +117,43 @@
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 2 ]]></Description>
+    <Description><![CDATA[cleanup skipLocal local 2]]></Description>
 </Message>
 </TestFunction>
 <TestFunction name="skipSingle">
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipSingle local 1 ]]></Description>
+    <Description><![CDATA[init skipSingle local 1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[global: false local: false ]]></Description>
+    <Description><![CDATA[global: false local: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 1 ]]></Description>
+    <Description><![CDATA[cleanup skipSingle local 1]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[1:local 1]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2 ]]></Description>
+    <Description><![CDATA[init skipSingle local 2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[global: false local: true ]]></Description>
+    <Description><![CDATA[global: false local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 2 ]]></Description>
+    <Description><![CDATA[cleanup skipSingle local 2]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[1:local 2]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[init skipSingle local 1 ]]></Description>
+    <Description><![CDATA[init skipSingle local 1]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="143">
     <DataTag><![CDATA[2:local 1]]></DataTag>
@@ -161,19 +161,19 @@
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 1 ]]></Description>
+    <Description><![CDATA[cleanup skipSingle local 1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2 ]]></Description>
+    <Description><![CDATA[init skipSingle local 2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[global: true local: true ]]></Description>
+    <Description><![CDATA[global: true local: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 2 ]]></Description>
+    <Description><![CDATA[cleanup skipSingle local 2]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[2:local 2]]></DataTag>
@@ -181,7 +181,7 @@
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[cleanupTestCase cleanupTestCase (null) ]]></Description>
+    <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.xunitxml b/tests/auto/testlib/selftests/expected_globaldata.xunitxml
index 9e0cd149dc..e8cd03a59c 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xunitxml
@@ -5,91 +5,91 @@
     <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase">
-    <!-- message="initTestCase initTestCase (null) " type="qdebug" -->
+    <!-- message="initTestCase initTestCase (null)" type="qdebug" -->
   </testcase>
   <testcase result="pass" name="testGlobal">
-    <!-- tag="1:local 1" message="init testGlobal local 1 " type="qdebug" -->
-    <!-- tag="1:local 1" message="global: false " type="qdebug" -->
-    <!-- tag="1:local 1" message="local: false " type="qdebug" -->
-    <!-- tag="1:local 1" message="cleanup testGlobal local 1 " type="qdebug" -->
-    <!-- tag="1:local 2" message="init testGlobal local 2 " type="qdebug" -->
-    <!-- tag="1:local 2" message="global: false " type="qdebug" -->
-    <!-- tag="1:local 2" message="local: true " type="qdebug" -->
-    <!-- tag="1:local 2" message="cleanup testGlobal local 2 " type="qdebug" -->
-    <!-- tag="2:local 1" message="init testGlobal local 1 " type="qdebug" -->
-    <!-- tag="2:local 1" message="global: true " type="qdebug" -->
-    <!-- tag="2:local 1" message="local: false " type="qdebug" -->
-    <!-- tag="2:local 1" message="cleanup testGlobal local 1 " type="qdebug" -->
-    <!-- tag="2:local 2" message="init testGlobal local 2 " type="qdebug" -->
-    <!-- tag="2:local 2" message="global: true " type="qdebug" -->
-    <!-- tag="2:local 2" message="local: true " type="qdebug" -->
-    <!-- tag="2:local 2" message="cleanup testGlobal local 2 " type="qdebug" -->
+    <!-- tag="1:local 1" message="init testGlobal local 1" type="qdebug" -->
+    <!-- tag="1:local 1" message="global: false" type="qdebug" -->
+    <!-- tag="1:local 1" message="local: false" type="qdebug" -->
+    <!-- tag="1:local 1" message="cleanup testGlobal local 1" type="qdebug" -->
+    <!-- tag="1:local 2" message="init testGlobal local 2" type="qdebug" -->
+    <!-- tag="1:local 2" message="global: false" type="qdebug" -->
+    <!-- tag="1:local 2" message="local: true" type="qdebug" -->
+    <!-- tag="1:local 2" message="cleanup testGlobal local 2" type="qdebug" -->
+    <!-- tag="2:local 1" message="init testGlobal local 1" type="qdebug" -->
+    <!-- tag="2:local 1" message="global: true" type="qdebug" -->
+    <!-- tag="2:local 1" message="local: false" type="qdebug" -->
+    <!-- tag="2:local 1" message="cleanup testGlobal local 1" type="qdebug" -->
+    <!-- tag="2:local 2" message="init testGlobal local 2" type="qdebug" -->
+    <!-- tag="2:local 2" message="global: true" type="qdebug" -->
+    <!-- tag="2:local 2" message="local: true" type="qdebug" -->
+    <!-- tag="2:local 2" message="cleanup testGlobal local 2" type="qdebug" -->
   </testcase>
   <testcase name="skip">
     <!-- tag="1" message="skipping" type="skip" -->
   </testcase>
   <testcase name="skipLocal">
-    <!-- tag="1:local 1" message="init skipLocal local 1 " type="qdebug" -->
+    <!-- tag="1:local 1" message="init skipLocal local 1" type="qdebug" -->
     <!-- tag="1:local 1" message="skipping" type="skip" -->
-    <!-- tag="1:local 1" message="cleanup skipLocal local 1 " type="qdebug" -->
-    <!-- tag="1:local 2" message="init skipLocal local 2 " type="qdebug" -->
+    <!-- tag="1:local 1" message="cleanup skipLocal local 1" type="qdebug" -->
+    <!-- tag="1:local 2" message="init skipLocal local 2" type="qdebug" -->
     <!-- tag="1:local 2" message="skipping" type="skip" -->
-    <!-- tag="1:local 2" message="cleanup skipLocal local 2 " type="qdebug" -->
+    <!-- tag="1:local 2" message="cleanup skipLocal local 2" type="qdebug" -->
   </testcase>
   <testcase result="pass" name="skipSingle">
-    <!-- tag="1:local 1" message="init skipSingle local 1 " type="qdebug" -->
-    <!-- tag="1:local 1" message="global: false local: false " type="qdebug" -->
-    <!-- tag="1:local 1" message="cleanup skipSingle local 1 " type="qdebug" -->
-    <!-- tag="1:local 2" message="init skipSingle local 2 " type="qdebug" -->
-    <!-- tag="1:local 2" message="global: false local: true " type="qdebug" -->
-    <!-- tag="1:local 2" message="cleanup skipSingle local 2 " type="qdebug" -->
-    <!-- tag="2:local 1" message="init skipSingle local 1 " type="qdebug" -->
+    <!-- tag="1:local 1" message="init skipSingle local 1" type="qdebug" -->
+    <!-- tag="1:local 1" message="global: false local: false" type="qdebug" -->
+    <!-- tag="1:local 1" message="cleanup skipSingle local 1" type="qdebug" -->
+    <!-- tag="1:local 2" message="init skipSingle local 2" type="qdebug" -->
+    <!-- tag="1:local 2" message="global: false local: true" type="qdebug" -->
+    <!-- tag="1:local 2" message="cleanup skipSingle local 2" type="qdebug" -->
+    <!-- tag="2:local 1" message="init skipSingle local 1" type="qdebug" -->
     <!-- tag="2:local 1" message="skipping" type="skip" -->
-    <!-- tag="2:local 1" message="cleanup skipSingle local 1 " type="qdebug" -->
-    <!-- tag="2:local 2" message="init skipSingle local 2 " type="qdebug" -->
-    <!-- tag="2:local 2" message="global: true local: true " type="qdebug" -->
-    <!-- tag="2:local 2" message="cleanup skipSingle local 2 " type="qdebug" -->
+    <!-- tag="2:local 1" message="cleanup skipSingle local 1" type="qdebug" -->
+    <!-- tag="2:local 2" message="init skipSingle local 2" type="qdebug" -->
+    <!-- tag="2:local 2" message="global: true local: true" type="qdebug" -->
+    <!-- tag="2:local 2" message="cleanup skipSingle local 2" type="qdebug" -->
   </testcase>
   <testcase result="pass" name="cleanupTestCase">
-    <!-- message="cleanupTestCase cleanupTestCase (null) " type="qdebug" -->
+    <!-- message="cleanupTestCase cleanupTestCase (null)" type="qdebug" -->
   </testcase>
   <system-err>
-<![CDATA[initTestCase initTestCase (null) ]]>
-<![CDATA[init testGlobal local 1 ]]>
-<![CDATA[global: false ]]>
-<![CDATA[local: false ]]>
-<![CDATA[cleanup testGlobal local 1 ]]>
-<![CDATA[init testGlobal local 2 ]]>
-<![CDATA[global: false ]]>
-<![CDATA[local: true ]]>
-<![CDATA[cleanup testGlobal local 2 ]]>
-<![CDATA[init testGlobal local 1 ]]>
-<![CDATA[global: true ]]>
-<![CDATA[local: false ]]>
-<![CDATA[cleanup testGlobal local 1 ]]>
-<![CDATA[init testGlobal local 2 ]]>
-<![CDATA[global: true ]]>
-<![CDATA[local: true ]]>
-<![CDATA[cleanup testGlobal local 2 ]]>
+<![CDATA[initTestCase initTestCase (null)]]>
+<![CDATA[init testGlobal local 1]]>
+<![CDATA[global: false]]>
+<![CDATA[local: false]]>
+<![CDATA[cleanup testGlobal local 1]]>
+<![CDATA[init testGlobal local 2]]>
+<![CDATA[global: false]]>
+<![CDATA[local: true]]>
+<![CDATA[cleanup testGlobal local 2]]>
+<![CDATA[init testGlobal local 1]]>
+<![CDATA[global: true]]>
+<![CDATA[local: false]]>
+<![CDATA[cleanup testGlobal local 1]]>
+<![CDATA[init testGlobal local 2]]>
+<![CDATA[global: true]]>
+<![CDATA[local: true]]>
+<![CDATA[cleanup testGlobal local 2]]>
 <![CDATA[skipping]]>
-<![CDATA[init skipLocal local 1 ]]>
+<![CDATA[init skipLocal local 1]]>
 <![CDATA[skipping]]>
-<![CDATA[cleanup skipLocal local 1 ]]>
-<![CDATA[init skipLocal local 2 ]]>
+<![CDATA[cleanup skipLocal local 1]]>
+<![CDATA[init skipLocal local 2]]>
 <![CDATA[skipping]]>
-<![CDATA[cleanup skipLocal local 2 ]]>
-<![CDATA[init skipSingle local 1 ]]>
-<![CDATA[global: false local: false ]]>
-<![CDATA[cleanup skipSingle local 1 ]]>
-<![CDATA[init skipSingle local 2 ]]>
-<![CDATA[global: false local: true ]]>
-<![CDATA[cleanup skipSingle local 2 ]]>
-<![CDATA[init skipSingle local 1 ]]>
+<![CDATA[cleanup skipLocal local 2]]>
+<![CDATA[init skipSingle local 1]]>
+<![CDATA[global: false local: false]]>
+<![CDATA[cleanup skipSingle local 1]]>
+<![CDATA[init skipSingle local 2]]>
+<![CDATA[global: false local: true]]>
+<![CDATA[cleanup skipSingle local 2]]>
+<![CDATA[init skipSingle local 1]]>
 <![CDATA[skipping]]>
-<![CDATA[cleanup skipSingle local 1 ]]>
-<![CDATA[init skipSingle local 2 ]]>
-<![CDATA[global: true local: true ]]>
-<![CDATA[cleanup skipSingle local 2 ]]>
-<![CDATA[cleanupTestCase cleanupTestCase (null) ]]>
+<![CDATA[cleanup skipSingle local 1]]>
+<![CDATA[init skipSingle local 2]]>
+<![CDATA[global: true local: true]]>
+<![CDATA[cleanup skipSingle local 2]]>
+<![CDATA[cleanupTestCase cleanupTestCase (null)]]>
   </system-err>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_subtest.lightxml b/tests/auto/testlib/selftests/expected_subtest.lightxml
index 5adbb771af..45d0a71a3e 100644
--- a/tests/auto/testlib/selftests/expected_subtest.lightxml
+++ b/tests/auto/testlib/selftests/expected_subtest.lightxml
@@ -4,82 +4,82 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[initTestCase initTestCase (null) ]]></Description>
+    <Description><![CDATA[initTestCase initTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
 <TestFunction name="test1">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[init test1 (null) ]]></Description>
+    <Description><![CDATA[init test1 (null)]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[test1 test1 (null) ]]></Description>
+    <Description><![CDATA[test1 test1 (null)]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[cleanup test1 (null) ]]></Description>
+    <Description><![CDATA[cleanup test1 (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
 <TestFunction name="test2">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[test2_data test2 (null) ]]></Description>
+    <Description><![CDATA[test2_data test2 (null)]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[test2_data end ]]></Description>
+    <Description><![CDATA[test2_data end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[init test2 data0 ]]></Description>
+    <Description><![CDATA[init test2 data0]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[test2 test2 data0 ]]></Description>
+    <Description><![CDATA[test2 test2 data0]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[test2 end ]]></Description>
+    <Description><![CDATA[test2 end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[cleanup test2 data0 ]]></Description>
+    <Description><![CDATA[cleanup test2 data0]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[init test2 data1 ]]></Description>
+    <Description><![CDATA[init test2 data1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[test2 test2 data1 ]]></Description>
+    <Description><![CDATA[test2 test2 data1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[test2 end ]]></Description>
+    <Description><![CDATA[test2 end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[cleanup test2 data1 ]]></Description>
+    <Description><![CDATA[cleanup test2 data1]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[init test2 data2 ]]></Description>
+    <Description><![CDATA[init test2 data2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[test2 test2 data2 ]]></Description>
+    <Description><![CDATA[test2 test2 data2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[test2 end ]]></Description>
+    <Description><![CDATA[test2 end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[cleanup test2 data2 ]]></Description>
+    <Description><![CDATA[cleanup test2 data2]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
@@ -87,37 +87,37 @@
 </TestFunction>
 <TestFunction name="test3">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[test3_data test3 (null) ]]></Description>
+    <Description><![CDATA[test3_data test3 (null)]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[test3_data end ]]></Description>
+    <Description><![CDATA[test3_data end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[init test3 data0 ]]></Description>
+    <Description><![CDATA[init test3 data0]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[test2 test3 data0 ]]></Description>
+    <Description><![CDATA[test2 test3 data0]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[test2 end ]]></Description>
+    <Description><![CDATA[test2 end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[cleanup test3 data0 ]]></Description>
+    <Description><![CDATA[cleanup test3 data0]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[init test3 data1 ]]></Description>
+    <Description><![CDATA[init test3 data1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[test2 test3 data1 ]]></Description>
+    <Description><![CDATA[test2 test3 data1]]></Description>
 </Message>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="154">
     <DataTag><![CDATA[data1]]></DataTag>
@@ -127,15 +127,15 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[cleanup test3 data1 ]]></Description>
+    <Description><![CDATA[cleanup test3 data1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[init test3 data2 ]]></Description>
+    <Description><![CDATA[init test3 data2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[test2 test3 data2 ]]></Description>
+    <Description><![CDATA[test2 test3 data2]]></Description>
 </Message>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="154">
     <DataTag><![CDATA[data2]]></DataTag>
@@ -145,12 +145,12 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[cleanup test3 data2 ]]></Description>
+    <Description><![CDATA[cleanup test3 data2]]></Description>
 </Message>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[cleanupTestCase cleanupTestCase (null) ]]></Description>
+    <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_subtest.txt b/tests/auto/testlib/selftests/expected_subtest.txt
index bb88f189ec..bb496bf33c 100644
--- a/tests/auto/testlib/selftests/expected_subtest.txt
+++ b/tests/auto/testlib/selftests/expected_subtest.txt
@@ -1,50 +1,50 @@
 ********* Start testing of tst_Subtest *********
 Config: Using QtTest library @INSERT_QT_VERSION_HERE@, Qt @INSERT_QT_VERSION_HERE@
-QDEBUG : tst_Subtest::initTestCase() initTestCase initTestCase (null) 
+QDEBUG : tst_Subtest::initTestCase() initTestCase initTestCase (null)
 PASS   : tst_Subtest::initTestCase()
-QDEBUG : tst_Subtest::test1() init test1 (null) 
-QDEBUG : tst_Subtest::test1() test1 test1 (null) 
-QDEBUG : tst_Subtest::test1() cleanup test1 (null) 
+QDEBUG : tst_Subtest::test1() init test1 (null)
+QDEBUG : tst_Subtest::test1() test1 test1 (null)
+QDEBUG : tst_Subtest::test1() cleanup test1 (null)
 PASS   : tst_Subtest::test1()
-QDEBUG : tst_Subtest::test2() test2_data test2 (null) 
-QDEBUG : tst_Subtest::test2() test2_data end 
-QDEBUG : tst_Subtest::test2(data0) init test2 data0 
-QDEBUG : tst_Subtest::test2(data0) test2 test2 data0 
-QDEBUG : tst_Subtest::test2(data0) test2 end 
-QDEBUG : tst_Subtest::test2(data0) cleanup test2 data0 
+QDEBUG : tst_Subtest::test2() test2_data test2 (null)
+QDEBUG : tst_Subtest::test2() test2_data end
+QDEBUG : tst_Subtest::test2(data0) init test2 data0
+QDEBUG : tst_Subtest::test2(data0) test2 test2 data0
+QDEBUG : tst_Subtest::test2(data0) test2 end
+QDEBUG : tst_Subtest::test2(data0) cleanup test2 data0
 PASS   : tst_Subtest::test2(data0)
-QDEBUG : tst_Subtest::test2(data1) init test2 data1 
-QDEBUG : tst_Subtest::test2(data1) test2 test2 data1 
-QDEBUG : tst_Subtest::test2(data1) test2 end 
-QDEBUG : tst_Subtest::test2(data1) cleanup test2 data1 
+QDEBUG : tst_Subtest::test2(data1) init test2 data1
+QDEBUG : tst_Subtest::test2(data1) test2 test2 data1
+QDEBUG : tst_Subtest::test2(data1) test2 end
+QDEBUG : tst_Subtest::test2(data1) cleanup test2 data1
 PASS   : tst_Subtest::test2(data1)
-QDEBUG : tst_Subtest::test2(data2) init test2 data2 
-QDEBUG : tst_Subtest::test2(data2) test2 test2 data2 
-QDEBUG : tst_Subtest::test2(data2) test2 end 
-QDEBUG : tst_Subtest::test2(data2) cleanup test2 data2 
+QDEBUG : tst_Subtest::test2(data2) init test2 data2
+QDEBUG : tst_Subtest::test2(data2) test2 test2 data2
+QDEBUG : tst_Subtest::test2(data2) test2 end
+QDEBUG : tst_Subtest::test2(data2) cleanup test2 data2
 PASS   : tst_Subtest::test2(data2)
-QDEBUG : tst_Subtest::test3() test3_data test3 (null) 
-QDEBUG : tst_Subtest::test3() test3_data end 
-QDEBUG : tst_Subtest::test3(data0) init test3 data0 
-QDEBUG : tst_Subtest::test3(data0) test2 test3 data0 
-QDEBUG : tst_Subtest::test3(data0) test2 end 
-QDEBUG : tst_Subtest::test3(data0) cleanup test3 data0 
+QDEBUG : tst_Subtest::test3() test3_data test3 (null)
+QDEBUG : tst_Subtest::test3() test3_data end
+QDEBUG : tst_Subtest::test3(data0) init test3 data0
+QDEBUG : tst_Subtest::test3(data0) test2 test3 data0
+QDEBUG : tst_Subtest::test3(data0) test2 end
+QDEBUG : tst_Subtest::test3(data0) cleanup test3 data0
 PASS   : tst_Subtest::test3(data0)
-QDEBUG : tst_Subtest::test3(data1) init test3 data1 
-QDEBUG : tst_Subtest::test3(data1) test2 test3 data1 
+QDEBUG : tst_Subtest::test3(data1) init test3 data1
+QDEBUG : tst_Subtest::test3(data1) test2 test3 data1
 FAIL!  : tst_Subtest::test3(data1) Compared values are not the same
    Actual   (str)              : hello1
    Expected (QString("hello0")): hello0
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(154)]
-QDEBUG : tst_Subtest::test3(data1) cleanup test3 data1 
-QDEBUG : tst_Subtest::test3(data2) init test3 data2 
-QDEBUG : tst_Subtest::test3(data2) test2 test3 data2 
+QDEBUG : tst_Subtest::test3(data1) cleanup test3 data1
+QDEBUG : tst_Subtest::test3(data2) init test3 data2
+QDEBUG : tst_Subtest::test3(data2) test2 test3 data2
 FAIL!  : tst_Subtest::test3(data2) Compared values are not the same
    Actual   (str)              : hello2
    Expected (QString("hello0")): hello0
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp(154)]
-QDEBUG : tst_Subtest::test3(data2) cleanup test3 data2 
-QDEBUG : tst_Subtest::cleanupTestCase() cleanupTestCase cleanupTestCase (null) 
+QDEBUG : tst_Subtest::test3(data2) cleanup test3 data2
+QDEBUG : tst_Subtest::cleanupTestCase() cleanupTestCase cleanupTestCase (null)
 PASS   : tst_Subtest::cleanupTestCase()
 Totals: 7 passed, 2 failed, 0 skipped
 ********* Finished testing of tst_Subtest *********
diff --git a/tests/auto/testlib/selftests/expected_subtest.xml b/tests/auto/testlib/selftests/expected_subtest.xml
index 094e22383d..b0a5c8a810 100644
--- a/tests/auto/testlib/selftests/expected_subtest.xml
+++ b/tests/auto/testlib/selftests/expected_subtest.xml
@@ -6,82 +6,82 @@
 </Environment>
 <TestFunction name="initTestCase">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[initTestCase initTestCase (null) ]]></Description>
+    <Description><![CDATA[initTestCase initTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
 <TestFunction name="test1">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[init test1 (null) ]]></Description>
+    <Description><![CDATA[init test1 (null)]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[test1 test1 (null) ]]></Description>
+    <Description><![CDATA[test1 test1 (null)]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[cleanup test1 (null) ]]></Description>
+    <Description><![CDATA[cleanup test1 (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
 <TestFunction name="test2">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[test2_data test2 (null) ]]></Description>
+    <Description><![CDATA[test2_data test2 (null)]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[test2_data end ]]></Description>
+    <Description><![CDATA[test2_data end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[init test2 data0 ]]></Description>
+    <Description><![CDATA[init test2 data0]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[test2 test2 data0 ]]></Description>
+    <Description><![CDATA[test2 test2 data0]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[test2 end ]]></Description>
+    <Description><![CDATA[test2 end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[cleanup test2 data0 ]]></Description>
+    <Description><![CDATA[cleanup test2 data0]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[init test2 data1 ]]></Description>
+    <Description><![CDATA[init test2 data1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[test2 test2 data1 ]]></Description>
+    <Description><![CDATA[test2 test2 data1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[test2 end ]]></Description>
+    <Description><![CDATA[test2 end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[cleanup test2 data1 ]]></Description>
+    <Description><![CDATA[cleanup test2 data1]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[init test2 data2 ]]></Description>
+    <Description><![CDATA[init test2 data2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[test2 test2 data2 ]]></Description>
+    <Description><![CDATA[test2 test2 data2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[test2 end ]]></Description>
+    <Description><![CDATA[test2 end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[cleanup test2 data2 ]]></Description>
+    <Description><![CDATA[cleanup test2 data2]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
@@ -89,37 +89,37 @@
 </TestFunction>
 <TestFunction name="test3">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[test3_data test3 (null) ]]></Description>
+    <Description><![CDATA[test3_data test3 (null)]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[test3_data end ]]></Description>
+    <Description><![CDATA[test3_data end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[init test3 data0 ]]></Description>
+    <Description><![CDATA[init test3 data0]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[test2 test3 data0 ]]></Description>
+    <Description><![CDATA[test2 test3 data0]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[test2 end ]]></Description>
+    <Description><![CDATA[test2 end]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
-    <Description><![CDATA[cleanup test3 data0 ]]></Description>
+    <Description><![CDATA[cleanup test3 data0]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
     <DataTag><![CDATA[data0]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[init test3 data1 ]]></Description>
+    <Description><![CDATA[init test3 data1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[test2 test3 data1 ]]></Description>
+    <Description><![CDATA[test2 test3 data1]]></Description>
 </Message>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="154">
     <DataTag><![CDATA[data1]]></DataTag>
@@ -129,15 +129,15 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data1]]></DataTag>
-    <Description><![CDATA[cleanup test3 data1 ]]></Description>
+    <Description><![CDATA[cleanup test3 data1]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[init test3 data2 ]]></Description>
+    <Description><![CDATA[init test3 data2]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[test2 test3 data2 ]]></Description>
+    <Description><![CDATA[test2 test3 data2]]></Description>
 </Message>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/subtest/tst_subtest.cpp" line="154">
     <DataTag><![CDATA[data2]]></DataTag>
@@ -147,12 +147,12 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[data2]]></DataTag>
-    <Description><![CDATA[cleanup test3 data2 ]]></Description>
+    <Description><![CDATA[cleanup test3 data2]]></Description>
 </Message>
 </TestFunction>
 <TestFunction name="cleanupTestCase">
 <Message type="qdebug" file="" line="0">
-    <Description><![CDATA[cleanupTestCase cleanupTestCase (null) ]]></Description>
+    <Description><![CDATA[cleanupTestCase cleanupTestCase (null)]]></Description>
 </Message>
 <Incident type="pass" file="" line="0" />
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_subtest.xunitxml b/tests/auto/testlib/selftests/expected_subtest.xunitxml
index 6f8fc3db45..5f7024e8ba 100644
--- a/tests/auto/testlib/selftests/expected_subtest.xunitxml
+++ b/tests/auto/testlib/selftests/expected_subtest.xunitxml
@@ -5,83 +5,83 @@
     <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
   </properties>
   <testcase result="pass" name="initTestCase">
-    <!-- message="initTestCase initTestCase (null) " type="qdebug" -->
+    <!-- message="initTestCase initTestCase (null)" type="qdebug" -->
   </testcase>
   <testcase result="pass" name="test1">
-    <!-- message="init test1 (null) " type="qdebug" -->
-    <!-- message="test1 test1 (null) " type="qdebug" -->
-    <!-- message="cleanup test1 (null) " type="qdebug" -->
+    <!-- message="init test1 (null)" type="qdebug" -->
+    <!-- message="test1 test1 (null)" type="qdebug" -->
+    <!-- message="cleanup test1 (null)" type="qdebug" -->
   </testcase>
   <testcase result="pass" name="test2">
-    <!-- message="test2_data test2 (null) " type="qdebug" -->
-    <!-- message="test2_data end " type="qdebug" -->
-    <!-- tag="data0" message="init test2 data0 " type="qdebug" -->
-    <!-- tag="data0" message="test2 test2 data0 " type="qdebug" -->
-    <!-- tag="data0" message="test2 end " type="qdebug" -->
-    <!-- tag="data0" message="cleanup test2 data0 " type="qdebug" -->
-    <!-- tag="data1" message="init test2 data1 " type="qdebug" -->
-    <!-- tag="data1" message="test2 test2 data1 " type="qdebug" -->
-    <!-- tag="data1" message="test2 end " type="qdebug" -->
-    <!-- tag="data1" message="cleanup test2 data1 " type="qdebug" -->
-    <!-- tag="data2" message="init test2 data2 " type="qdebug" -->
-    <!-- tag="data2" message="test2 test2 data2 " type="qdebug" -->
-    <!-- tag="data2" message="test2 end " type="qdebug" -->
-    <!-- tag="data2" message="cleanup test2 data2 " type="qdebug" -->
+    <!-- message="test2_data test2 (null)" type="qdebug" -->
+    <!-- message="test2_data end" type="qdebug" -->
+    <!-- tag="data0" message="init test2 data0" type="qdebug" -->
+    <!-- tag="data0" message="test2 test2 data0" type="qdebug" -->
+    <!-- tag="data0" message="test2 end" type="qdebug" -->
+    <!-- tag="data0" message="cleanup test2 data0" type="qdebug" -->
+    <!-- tag="data1" message="init test2 data1" type="qdebug" -->
+    <!-- tag="data1" message="test2 test2 data1" type="qdebug" -->
+    <!-- tag="data1" message="test2 end" type="qdebug" -->
+    <!-- tag="data1" message="cleanup test2 data1" type="qdebug" -->
+    <!-- tag="data2" message="init test2 data2" type="qdebug" -->
+    <!-- tag="data2" message="test2 test2 data2" type="qdebug" -->
+    <!-- tag="data2" message="test2 end" type="qdebug" -->
+    <!-- tag="data2" message="cleanup test2 data2" type="qdebug" -->
   </testcase>
   <testcase result="fail" name="test3">
-    <!-- message="test3_data test3 (null) " type="qdebug" -->
-    <!-- message="test3_data end " type="qdebug" -->
-    <!-- tag="data0" message="init test3 data0 " type="qdebug" -->
-    <!-- tag="data0" message="test2 test3 data0 " type="qdebug" -->
-    <!-- tag="data0" message="test2 end " type="qdebug" -->
-    <!-- tag="data0" message="cleanup test3 data0 " type="qdebug" -->
-    <!-- tag="data1" message="init test3 data1 " type="qdebug" -->
-    <!-- tag="data1" message="test2 test3 data1 " type="qdebug" -->
+    <!-- message="test3_data test3 (null)" type="qdebug" -->
+    <!-- message="test3_data end" type="qdebug" -->
+    <!-- tag="data0" message="init test3 data0" type="qdebug" -->
+    <!-- tag="data0" message="test2 test3 data0" type="qdebug" -->
+    <!-- tag="data0" message="test2 end" type="qdebug" -->
+    <!-- tag="data0" message="cleanup test3 data0" type="qdebug" -->
+    <!-- tag="data1" message="init test3 data1" type="qdebug" -->
+    <!-- tag="data1" message="test2 test3 data1" type="qdebug" -->
     <failure tag="data1" message="Compared values are not the same
    Actual   (str)              : hello1
    Expected (QString(&quot;hello0&quot;)): hello0" result="fail"/>
-    <!-- tag="data1" message="cleanup test3 data1 " type="qdebug" -->
-    <!-- tag="data2" message="init test3 data2 " type="qdebug" -->
-    <!-- tag="data2" message="test2 test3 data2 " type="qdebug" -->
+    <!-- tag="data1" message="cleanup test3 data1" type="qdebug" -->
+    <!-- tag="data2" message="init test3 data2" type="qdebug" -->
+    <!-- tag="data2" message="test2 test3 data2" type="qdebug" -->
     <failure tag="data2" message="Compared values are not the same
    Actual   (str)              : hello2
    Expected (QString(&quot;hello0&quot;)): hello0" result="fail"/>
-    <!-- tag="data2" message="cleanup test3 data2 " type="qdebug" -->
+    <!-- tag="data2" message="cleanup test3 data2" type="qdebug" -->
   </testcase>
   <testcase result="pass" name="cleanupTestCase">
-    <!-- message="cleanupTestCase cleanupTestCase (null) " type="qdebug" -->
+    <!-- message="cleanupTestCase cleanupTestCase (null)" type="qdebug" -->
   </testcase>
   <system-err>
-<![CDATA[initTestCase initTestCase (null) ]]>
-<![CDATA[init test1 (null) ]]>
-<![CDATA[test1 test1 (null) ]]>
-<![CDATA[cleanup test1 (null) ]]>
-<![CDATA[test2_data test2 (null) ]]>
-<![CDATA[test2_data end ]]>
-<![CDATA[init test2 data0 ]]>
-<![CDATA[test2 test2 data0 ]]>
-<![CDATA[test2 end ]]>
-<![CDATA[cleanup test2 data0 ]]>
-<![CDATA[init test2 data1 ]]>
-<![CDATA[test2 test2 data1 ]]>
-<![CDATA[test2 end ]]>
-<![CDATA[cleanup test2 data1 ]]>
-<![CDATA[init test2 data2 ]]>
-<![CDATA[test2 test2 data2 ]]>
-<![CDATA[test2 end ]]>
-<![CDATA[cleanup test2 data2 ]]>
-<![CDATA[test3_data test3 (null) ]]>
-<![CDATA[test3_data end ]]>
-<![CDATA[init test3 data0 ]]>
-<![CDATA[test2 test3 data0 ]]>
-<![CDATA[test2 end ]]>
-<![CDATA[cleanup test3 data0 ]]>
-<![CDATA[init test3 data1 ]]>
-<![CDATA[test2 test3 data1 ]]>
-<![CDATA[cleanup test3 data1 ]]>
-<![CDATA[init test3 data2 ]]>
-<![CDATA[test2 test3 data2 ]]>
-<![CDATA[cleanup test3 data2 ]]>
-<![CDATA[cleanupTestCase cleanupTestCase (null) ]]>
+<![CDATA[initTestCase initTestCase (null)]]>
+<![CDATA[init test1 (null)]]>
+<![CDATA[test1 test1 (null)]]>
+<![CDATA[cleanup test1 (null)]]>
+<![CDATA[test2_data test2 (null)]]>
+<![CDATA[test2_data end]]>
+<![CDATA[init test2 data0]]>
+<![CDATA[test2 test2 data0]]>
+<![CDATA[test2 end]]>
+<![CDATA[cleanup test2 data0]]>
+<![CDATA[init test2 data1]]>
+<![CDATA[test2 test2 data1]]>
+<![CDATA[test2 end]]>
+<![CDATA[cleanup test2 data1]]>
+<![CDATA[init test2 data2]]>
+<![CDATA[test2 test2 data2]]>
+<![CDATA[test2 end]]>
+<![CDATA[cleanup test2 data2]]>
+<![CDATA[test3_data test3 (null)]]>
+<![CDATA[test3_data end]]>
+<![CDATA[init test3 data0]]>
+<![CDATA[test2 test3 data0]]>
+<![CDATA[test2 end]]>
+<![CDATA[cleanup test3 data0]]>
+<![CDATA[init test3 data1]]>
+<![CDATA[test2 test3 data1]]>
+<![CDATA[cleanup test3 data1]]>
+<![CDATA[init test3 data2]]>
+<![CDATA[test2 test3 data2]]>
+<![CDATA[cleanup test3 data2]]>
+<![CDATA[cleanupTestCase cleanupTestCase (null)]]>
   </system-err>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_verbose1.lightxml b/tests/auto/testlib/selftests/expected_verbose1.lightxml
index c49792fec4..799a7d7b17 100644
--- a/tests/auto/testlib/selftests/expected_verbose1.lightxml
+++ b/tests/auto/testlib/selftests/expected_verbose1.lightxml
@@ -107,7 +107,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[fail]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description>
 </Message>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242">
     <DataTag><![CDATA[fail]]></DataTag>
@@ -135,7 +135,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244">
     <DataTag><![CDATA[skip]]></DataTag>
diff --git a/tests/auto/testlib/selftests/expected_verbose1.txt b/tests/auto/testlib/selftests/expected_verbose1.txt
index 4ba42c1c8e..23962a0ff6 100644
--- a/tests/auto/testlib/selftests/expected_verbose1.txt
+++ b/tests/auto/testlib/selftests/expected_verbose1.txt
@@ -48,7 +48,7 @@ FAIL!  : tst_Counting::testFailInInit(fail) Fail in init()
 PASS   : tst_Counting::testFailInInit(after)
 INFO   : tst_Counting::testFailInCleanup() entering
 PASS   : tst_Counting::testFailInCleanup(before)
-QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() 
+QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup()
 FAIL!  : tst_Counting::testFailInCleanup(fail) Fail in cleanup()
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(242)]
 PASS   : tst_Counting::testFailInCleanup(after)
@@ -59,7 +59,7 @@ SKIP   : tst_Counting::testSkipInInit(skip) Skip in init()
 PASS   : tst_Counting::testSkipInInit(after)
 INFO   : tst_Counting::testSkipInCleanup() entering
 PASS   : tst_Counting::testSkipInCleanup(before)
-QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() 
+QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup()
 SKIP   : tst_Counting::testSkipInCleanup(skip) Skip in cleanup()
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(244)]
 PASS   : tst_Counting::testSkipInCleanup(after)
diff --git a/tests/auto/testlib/selftests/expected_verbose1.xml b/tests/auto/testlib/selftests/expected_verbose1.xml
index 7caa915f65..8177a2dc7f 100644
--- a/tests/auto/testlib/selftests/expected_verbose1.xml
+++ b/tests/auto/testlib/selftests/expected_verbose1.xml
@@ -109,7 +109,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[fail]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description>
 </Message>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242">
     <DataTag><![CDATA[fail]]></DataTag>
@@ -137,7 +137,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244">
     <DataTag><![CDATA[skip]]></DataTag>
diff --git a/tests/auto/testlib/selftests/expected_verbose1.xunitxml b/tests/auto/testlib/selftests/expected_verbose1.xunitxml
index f317ed5923..72bf047ba8 100644
--- a/tests/auto/testlib/selftests/expected_verbose1.xunitxml
+++ b/tests/auto/testlib/selftests/expected_verbose1.xunitxml
@@ -38,14 +38,14 @@
     <failure tag="fail" message="Fail in init()" result="fail"/>
   </testcase>
   <testcase result="fail" name="testFailInCleanup">
-    <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup() " type="qdebug" -->
+    <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup()" type="qdebug" -->
     <failure tag="fail" message="Fail in cleanup()" result="fail"/>
   </testcase>
   <testcase result="pass" name="testSkipInInit">
     <!-- tag="skip" message="Skip in init()" type="skip" -->
   </testcase>
   <testcase result="pass" name="testSkipInCleanup">
-    <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup() " type="qdebug" -->
+    <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup()" type="qdebug" -->
     <!-- tag="skip" message="Skip in cleanup()" type="skip" -->
   </testcase>
   <testcase result="pass" name="cleanupTestCase"/>
@@ -56,9 +56,9 @@
 <![CDATA[Skipping]]>
 <![CDATA[Skipping]]>
 <![CDATA[Skipping]]>
-<![CDATA[This test function should execute and then QFAIL in cleanup() ]]>
+<![CDATA[This test function should execute and then QFAIL in cleanup()]]>
 <![CDATA[Skip in init()]]>
-<![CDATA[This test function should execute and then QSKIP in cleanup() ]]>
+<![CDATA[This test function should execute and then QSKIP in cleanup()]]>
 <![CDATA[Skip in cleanup()]]>
   </system-err>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_verbose2.lightxml b/tests/auto/testlib/selftests/expected_verbose2.lightxml
index 2937adbe01..4e5f9952b8 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.lightxml
+++ b/tests/auto/testlib/selftests/expected_verbose2.lightxml
@@ -179,7 +179,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[fail]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description>
 </Message>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242">
     <DataTag><![CDATA[fail]]></DataTag>
@@ -207,7 +207,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244">
     <DataTag><![CDATA[skip]]></DataTag>
diff --git a/tests/auto/testlib/selftests/expected_verbose2.txt b/tests/auto/testlib/selftests/expected_verbose2.txt
index e9c7838f6d..d8c6e4a218 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.txt
+++ b/tests/auto/testlib/selftests/expected_verbose2.txt
@@ -84,7 +84,7 @@ FAIL!  : tst_Counting::testFailInInit(fail) Fail in init()
 PASS   : tst_Counting::testFailInInit(after)
 INFO   : tst_Counting::testFailInCleanup() entering
 PASS   : tst_Counting::testFailInCleanup(before)
-QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup() 
+QDEBUG : tst_Counting::testFailInCleanup(fail) This test function should execute and then QFAIL in cleanup()
 FAIL!  : tst_Counting::testFailInCleanup(fail) Fail in cleanup()
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(242)]
 PASS   : tst_Counting::testFailInCleanup(after)
@@ -95,7 +95,7 @@ SKIP   : tst_Counting::testSkipInInit(skip) Skip in init()
 PASS   : tst_Counting::testSkipInInit(after)
 INFO   : tst_Counting::testSkipInCleanup() entering
 PASS   : tst_Counting::testSkipInCleanup(before)
-QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup() 
+QDEBUG : tst_Counting::testSkipInCleanup(skip) This test function should execute and then QSKIP in cleanup()
 SKIP   : tst_Counting::testSkipInCleanup(skip) Skip in cleanup()
    Loc: [/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp(244)]
 PASS   : tst_Counting::testSkipInCleanup(after)
diff --git a/tests/auto/testlib/selftests/expected_verbose2.xml b/tests/auto/testlib/selftests/expected_verbose2.xml
index bbdca567d3..bf5e7c7570 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.xml
+++ b/tests/auto/testlib/selftests/expected_verbose2.xml
@@ -181,7 +181,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[fail]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QFAIL in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QFAIL in cleanup()]]></Description>
 </Message>
 <Incident type="fail" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="242">
     <DataTag><![CDATA[fail]]></DataTag>
@@ -209,7 +209,7 @@
 </Incident>
 <Message type="qdebug" file="" line="0">
     <DataTag><![CDATA[skip]]></DataTag>
-    <Description><![CDATA[This test function should execute and then QSKIP in cleanup() ]]></Description>
+    <Description><![CDATA[This test function should execute and then QSKIP in cleanup()]]></Description>
 </Message>
 <Message type="skip" file="/home/user/dev/qt5/qtbase/tests/auto/testlib/selftests/counting/tst_counting.cpp" line="244">
     <DataTag><![CDATA[skip]]></DataTag>
diff --git a/tests/auto/testlib/selftests/expected_verbose2.xunitxml b/tests/auto/testlib/selftests/expected_verbose2.xunitxml
index a774cb9d9f..6dabbd34fc 100644
--- a/tests/auto/testlib/selftests/expected_verbose2.xunitxml
+++ b/tests/auto/testlib/selftests/expected_verbose2.xunitxml
@@ -57,14 +57,14 @@
     <failure tag="fail" message="Fail in init()" result="fail"/>
   </testcase>
   <testcase result="fail" name="testFailInCleanup">
-    <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup() " type="qdebug" -->
+    <!-- tag="fail" message="This test function should execute and then QFAIL in cleanup()" type="qdebug" -->
     <failure tag="fail" message="Fail in cleanup()" result="fail"/>
   </testcase>
   <testcase result="pass" name="testSkipInInit">
     <!-- tag="skip" message="Skip in init()" type="skip" -->
   </testcase>
   <testcase result="pass" name="testSkipInCleanup">
-    <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup() " type="qdebug" -->
+    <!-- tag="skip" message="This test function should execute and then QSKIP in cleanup()" type="qdebug" -->
     <!-- tag="skip" message="Skip in cleanup()" type="skip" -->
   </testcase>
   <testcase result="pass" name="cleanupTestCase"/>
@@ -93,9 +93,9 @@
 <![CDATA[Skipping]]>
 <![CDATA[QVERIFY(false)]]>
 <![CDATA[QVERIFY(false)]]>
-<![CDATA[This test function should execute and then QFAIL in cleanup() ]]>
+<![CDATA[This test function should execute and then QFAIL in cleanup()]]>
 <![CDATA[Skip in init()]]>
-<![CDATA[This test function should execute and then QSKIP in cleanup() ]]>
+<![CDATA[This test function should execute and then QSKIP in cleanup()]]>
 <![CDATA[Skip in cleanup()]]>
   </system-err>
 </testsuite>