Merge "Merge remote-tracking branch 'origin/5.13' into dev" into refs/staging/dev

61 files changed, 3289 insertions, 445 deletions

diff --git a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
index e567e465f7..0a84b1fdd8 100644
--- a/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
+++ b/tests/auto/corelib/global/qnumeric/tst_qnumeric.cpp
@@ -508,13 +508,13 @@ template <typename Int> static void mulOverflow_template()
     QCOMPARE(mul_overflow(Int(max / 2), Int(3), &r), true);
     QCOMPARE(mul_overflow(mid1, Int(mid2 + 1), &r), true);
     QCOMPARE(mul_overflow(Int(max / 2 + 2), Int(2), &r), true);
+    QCOMPARE(mul_overflow(Int(max - max / 2), Int(2), &r), true);
     QCOMPARE(mul_overflow(Int(1ULL << (std::numeric_limits<Int>::digits - 1)), Int(2), &r), true);
 
     if (min) {
         QCOMPARE(mul_overflow(min, Int(2), &r), true);
         QCOMPARE(mul_overflow(Int(min / 2), Int(3), &r), true);
         QCOMPARE(mul_overflow(Int(min / 2 - 1), Int(2), &r), true);
-        QCOMPARE(mul_overflow(Int(min + min/2), Int(2), &r), true);
     }
 #endif
 }
diff --git a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
index 262c6dd9c8..c76052a38b 100644
--- a/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qidentityproxymodel/tst_qidentityproxymodel.cpp
@@ -32,10 +32,13 @@
 #include <QStandardItemModel>
 #include <QStringListModel>
 #include <QTest>
+#include <QLoggingCategory>
 
 #include "dynamictreemodel.h"
 #include "qidentityproxymodel.h"
 
+Q_LOGGING_CATEGORY(lcItemModels, "qt.corelib.tests.itemmodels")
+
 class DataChangedModel : public QAbstractListModel
 {
 public:
@@ -390,7 +393,7 @@ void dump(QAbstractItemModel* model, QString const& indent = " - ", QModelIndex
     for (auto row = 0; row < model->rowCount(parent); ++row)
     {
         auto idx = model->index(row, 0, parent);
-        qDebug() << (indent + idx.data().toString());
+        qCDebug(lcItemModels) << (indent + idx.data().toString());
         dump(model, indent + "- ", idx);
     }
 }
diff --git a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
index da13b9f33f..b9deb7b6a9 100644
--- a/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qitemmodel/tst_qitemmodel.cpp
@@ -125,6 +125,7 @@ private:
 tst_QItemModel::tst_QItemModel()
 {
     qRegisterMetaType<QAbstractItemModel::LayoutChangeHint>();
+    qRegisterMetaType<QList<QPersistentModelIndex>>();
 }
 
 void tst_QItemModel::init()
@@ -181,7 +182,7 @@ void tst_QItemModel::nonDestructiveBasicTest()
     currentModel->hasChildren(QModelIndex());
     currentModel->hasIndex(0, 0);
     currentModel->headerData(0, Qt::Horizontal);
-    currentModel->index(0,0), QModelIndex();
+    currentModel->index(0,0);
     currentModel->itemData(QModelIndex());
     QVariant cache;
     currentModel->match(QModelIndex(), -1, cache);
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
index 82cd26971b..ccce5a44e5 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.cpp
@@ -38,6 +38,8 @@
 
 #include <qdebug.h>
 
+Q_LOGGING_CATEGORY(lcItemModels, "qt.corelib.tests.itemmodels")
+
 // Testing get/set functions
 void tst_QSortFilterProxyModel::getSetCheck()
 {
@@ -2361,6 +2363,45 @@ void tst_QSortFilterProxyModel::match()
         QCOMPARE(indexes.at(i).row(), expectedProxyItems.at(i));
 }
 
+QList<QStandardItem *> createStandardItemList(const QString &prefix, int n)
+{
+    QList<QStandardItem *> result;
+    for (int i = 0; i < n; ++i)
+        result.append(new QStandardItem(prefix + QString::number(i)));
+    return result;
+}
+
+// QTBUG-73864, recursive search in a tree model.
+
+void tst_QSortFilterProxyModel::matchTree()
+{
+    QStandardItemModel model(0, 2);
+    // Header00 Header01
+    // Header10 Header11
+    //   Item00 Item01
+    //   Item10 Item11
+    model.appendRow(createStandardItemList(QLatin1String("Header0"), 2));
+    auto headerRow = createStandardItemList(QLatin1String("Header1"), 2);
+    model.appendRow(headerRow);
+    headerRow.first()->appendRow(createStandardItemList(QLatin1String("Item0"), 2));
+    headerRow.first()->appendRow(createStandardItemList(QLatin1String("Item1"), 2));
+
+    auto item11 = model.match(model.index(1, 1), Qt::DisplayRole, QLatin1String("Item11"), 20,
+                              Qt::MatchRecursive).value(0);
+    QVERIFY(item11.isValid());
+    QCOMPARE(item11.data().toString(), QLatin1String("Item11"));
+
+    // Repeat in proxy model
+    QSortFilterProxyModel proxy;
+    proxy.setSourceModel(&model);
+    auto proxyItem11 = proxy.match(proxy.index(1, 1), Qt::DisplayRole, QLatin1String("Item11"), 20,
+                              Qt::MatchRecursive).value(0);
+    QVERIFY(proxyItem11.isValid());
+    QCOMPARE(proxyItem11.data().toString(), QLatin1String("Item11"));
+
+    QCOMPARE(proxy.mapToSource(proxyItem11).internalId(), item11.internalId());
+}
+
 void tst_QSortFilterProxyModel::insertIntoChildrenlessItem()
 {
     QStandardItemModel model;
@@ -4277,7 +4318,7 @@ public:
     QModelIndex index(int, int, const QModelIndex& parent = QModelIndex()) const override
     {
         // QTBUG-44962: Would we always expect the parent to belong to the model
-        qDebug() << parent.model() << this;
+        qCDebug(lcItemModels) << parent.model() << this;
         Q_ASSERT(!parent.isValid() || parent.model() == this);
 
         quintptr parentId = (parent.isValid()) ? parent.internalId() : 0;
@@ -4363,7 +4404,7 @@ void tst_QSortFilterProxyModel::sourceLayoutChangeLeavesValidPersistentIndexes()
     // The use of qDebug here makes sufficient use of the heap to
     // cause corruption at runtime with normal use on linux (before
     // the fix). valgrind confirms the fix.
-    qDebug() << persistentIndex.parent();
+    qCDebug(lcItemModels) << persistentIndex.parent();
     QVERIFY(persistentIndex.parent().isValid());
 }
 
diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
index 82d4b7344e..8ae97165b8 100644
--- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
+++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel_common/tst_qsortfilterproxymodel.h
@@ -109,6 +109,7 @@ private slots:
     void selectionFilteredOut();
     void match_data();
     void match();
+    void matchTree();
     void insertIntoChildrenlessItem();
     void invalidateMappedChildren();
     void insertRowIntoFilteredParent();
@@ -186,4 +187,6 @@ private:
 
 Q_DECLARE_METATYPE(QAbstractItemModel::LayoutChangeHint)
 
+Q_DECLARE_LOGGING_CATEGORY(lcItemModels)
+
 #endif // TST_QSORTFILTERPROXYMODEL_H
diff --git a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
index b823ca2aab..f51fb9bf49 100644
--- a/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
+++ b/tests/auto/corelib/kernel/qobject/tst_qobject.cpp
@@ -3411,12 +3411,11 @@ void tst_QObject::disconnectSelfInSlotAndDeleteAfterEmit()
 void tst_QObject::dumpObjectInfo()
 {
     QObject a, b;
-    QObject::connect(&a, SIGNAL(destroyed(QObject*)), &b, SLOT(deleteLater()));
-    a.disconnect(&b);
+    QObject::connect(&a, &QObject::destroyed, &b, &QObject::deleteLater);
     QTest::ignoreMessage(QtDebugMsg, "OBJECT QObject::unnamed");
     QTest::ignoreMessage(QtDebugMsg, "  SIGNALS OUT");
     QTest::ignoreMessage(QtDebugMsg, "        signal: destroyed(QObject*)");
-    QTest::ignoreMessage(QtDebugMsg, "          <Disconnected receiver>");
+    QTest::ignoreMessage(QtDebugMsg, "          <functor or function pointer>");
     QTest::ignoreMessage(QtDebugMsg, "  SIGNALS IN");
     QTest::ignoreMessage(QtDebugMsg, "        <None>");
     a.dumpObjectInfo(); // should not crash
@@ -7575,8 +7574,6 @@ void tst_QObject::functorReferencesConnection()
             // top-level + the one in the 3 others lambdas
             QCOMPARE(countedStructObjectsCount, 4);
             QObject::disconnect(*c2);
-            // the one in the c2's lambda is gone
-            QCOMPARE(countedStructObjectsCount, 3);
             slot1Called++;
         });
         connect(&obj, &GetSenderObject::aSignal, [] {}); // just a dummy signal to fill the connection list
diff --git a/tests/auto/corelib/kernel/qtimer/BLACKLIST b/tests/auto/corelib/kernel/qtimer/BLACKLIST
new file mode 100644
index 0000000000..16cbab4587
--- /dev/null
+++ b/tests/auto/corelib/kernel/qtimer/BLACKLIST
@@ -0,0 +1,5 @@
+[remainingTime]
+windows
+osx
+[basic_chrono]
+osx
diff --git a/tests/auto/corelib/serialization/qdatastream_core_pixmap/qdatastream_core_pixmap.pro b/tests/auto/corelib/serialization/qdatastream_core_pixmap/qdatastream_core_pixmap.pro
new file mode 100644
index 0000000000..7e003304af
--- /dev/null
+++ b/tests/auto/corelib/serialization/qdatastream_core_pixmap/qdatastream_core_pixmap.pro
@@ -0,0 +1,4 @@
+CONFIG += testcase
+TARGET = tst_qdatastream_core_pixmap
+QT += testlib
+SOURCES = tst_qdatastream_core_pixmap.cpp
diff --git a/tests/auto/corelib/serialization/qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp b/tests/auto/corelib/serialization/qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp
new file mode 100644
index 0000000000..c931016a61
--- /dev/null
+++ b/tests/auto/corelib/serialization/qdatastream_core_pixmap/tst_qdatastream_core_pixmap.cpp
@@ -0,0 +1,68 @@
+/****************************************************************************
+**
+** Copyright (C) 2019 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtTest/QtTest>
+#include <QtGui/QBitmap>
+#include <QtGui/QPalette>
+#include <QtGui/QPixmap>
+#include <QtGui/QPicture>
+#include <QtGui/QTextLength>
+#include <QtGui/QPainter>
+#include <QtGui/QPen>
+
+class tst_QDataStream : public QObject
+{
+Q_OBJECT
+
+private slots:
+    void stream_with_pixmap();
+
+};
+
+void tst_QDataStream::stream_with_pixmap()
+{
+    // This is a QVariantMap with a 3x3 red QPixmap and two strings inside
+    const QByteArray ba = QByteArray::fromBase64("AAAAAwAAAAIAegAAAAoAAAAACgB0AGgAZQByAGUAAAACAHAAAABBAAAAAAGJUE5HDQoaCgAAAA1JSERSAAAAAwAAAAMIAgAAANlKIugAAAAJcEhZcwAADsQAAA7EAZUrDhsAAAAQSURBVAiZY/zPAAVMDJgsAB1bAQXZn5ieAAAAAElFTkSuQmCCAAAAAgBhAAAACgAAAAAKAGgAZQBsAGwAbw==");
+    QImage dummy; // Needed to make sure qtGui is loaded
+
+    QTest::ignoreMessage(QtWarningMsg, "QPixmap::fromImageInPlace: QPixmap cannot be created without a QGuiApplication");
+
+    QVariantMap map;
+    QDataStream d(ba);
+    d.setVersion(QDataStream::Qt_5_12);
+    d >> map;
+
+    QCOMPARE(map["a"].toString(), QString("hello"));
+    QCOMPARE(map["p"].value<QPixmap>(), QPixmap()); // the pixmap is null because this is not a QGuiApplication
+    QCOMPARE(map["z"].toString(), QString("there"));
+}
+
+QTEST_GUILESS_MAIN(tst_QDataStream)
+
+#include "tst_qdatastream_core_pixmap.moc"
+
diff --git a/tests/auto/corelib/serialization/serialization.pro b/tests/auto/corelib/serialization/serialization.pro
index 9187de1bc5..9638178cdc 100644
--- a/tests/auto/corelib/serialization/serialization.pro
+++ b/tests/auto/corelib/serialization/serialization.pro
@@ -6,6 +6,7 @@ SUBDIRS = \
     qcborvalue \
     qcborvalue_json \
     qdatastream \
+    qdatastream_core_pixmap \
     qtextstream \
     qxmlstream
 
diff --git a/tests/auto/corelib/thread/qthread/tst_qthread.cpp b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
index d73dcc1b6d..f72b662c94 100644
--- a/tests/auto/corelib/thread/qthread/tst_qthread.cpp
+++ b/tests/auto/corelib/thread/qthread/tst_qthread.cpp
@@ -1330,6 +1330,8 @@ void tst_QThread::quitLock()
     QCOMPARE(job->thread(), &thread);
     loop.exec();
     QVERIFY(exitThreadCalled);
+
+    delete job;
 }
 
 void tst_QThread::create()
diff --git a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
index 838431cd5a..27b49602fc 100644
--- a/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
+++ b/tests/auto/corelib/thread/qthreadpool/tst_qthreadpool.cpp
@@ -1322,6 +1322,7 @@ void tst_QThreadPool::waitForDoneAfterTake()
         QRunnable *runnable = createTask(emptyFunct);
         manager.start(runnable);
         QVERIFY(manager.tryTake(runnable));
+        delete runnable;
     }
 
     // Add another runnable that will not be removed
diff --git a/tests/auto/corelib/tools/qdate/tst_qdate.cpp b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
index ce1e5730dd..c17af8741b 100644
--- a/tests/auto/corelib/tools/qdate/tst_qdate.cpp
+++ b/tests/auto/corelib/tools/qdate/tst_qdate.cpp
@@ -83,6 +83,7 @@ private slots:
     void negativeYear() const;
     void printNegativeYear() const;
     void roundtripGermanLocale() const;
+#if QT_CONFIG(textdate)
     void shortDayName() const;
     void standaloneShortDayName() const;
     void longDayName() const;
@@ -91,6 +92,7 @@ private slots:
     void standaloneShortMonthName() const;
     void longMonthName() const;
     void standaloneLongMonthName() const;
+#endif // textdate
     void roundtrip() const;
     void qdebug() const;
 private:
@@ -1038,18 +1040,18 @@ void tst_QDate::fromStringFormat_data()
 
     // Undo this (inline the C-locale versions) for ### Qt 6
     // Get localized names:
-    QString january = QDate::longMonthName(1);
-    QString february = QDate::longMonthName(2);
-    QString march = QDate::longMonthName(3);
-    QString august = QDate::longMonthName(8);
-    QString mon = QDate::shortDayName(1);
-    QString monday = QDate::longDayName(1);
-    QString tuesday = QDate::longDayName(2);
-    QString wednesday = QDate::longDayName(3);
-    QString thursday = QDate::longDayName(4);
-    QString friday = QDate::longDayName(5);
-    QString saturday = QDate::longDayName(6);
-    QString sunday = QDate::longDayName(7);
+    QString january = QLocale::system().monthName(1, QLocale::LongFormat);
+    QString february = QLocale::system().monthName(2, QLocale::LongFormat);
+    QString march = QLocale::system().monthName(3, QLocale::LongFormat);
+    QString august = QLocale::system().monthName(8, QLocale::LongFormat);
+    QString mon = QLocale::system().dayName(1, QLocale::ShortFormat);
+    QString monday = QLocale::system().dayName(1, QLocale::LongFormat);
+    QString tuesday = QLocale::system().dayName(2, QLocale::LongFormat);
+    QString wednesday = QLocale::system().dayName(3, QLocale::LongFormat);
+    QString thursday = QLocale::system().dayName(4, QLocale::LongFormat);
+    QString friday = QLocale::system().dayName(5, QLocale::LongFormat);
+    QString saturday = QLocale::system().dayName(6, QLocale::LongFormat);
+    QString sunday = QLocale::system().dayName(7, QLocale::LongFormat);
 
     QTest::newRow("data0") << QString("") << QString("") << defDate();
     QTest::newRow("data1") << QString(" ") << QString("") << invalidDate();
@@ -1305,6 +1307,10 @@ void tst_QDate::roundtripGermanLocale() const
     theDateTime.fromString(theDateTime.toString(Qt::TextDate), Qt::TextDate);
 }
 
+#if QT_CONFIG(textdate)
+QT_WARNING_PUSH // the methods tested here are all deprecated
+QT_WARNING_DISABLE_GCC("-Wdeprecated-declarations")
+
 void tst_QDate::shortDayName() const
 {
     QCOMPARE(QDate::shortDayName(0), QString());
@@ -1432,6 +1438,8 @@ void tst_QDate::standaloneLongMonthName() const
         QCOMPARE(QDate::longMonthName(i, QDate::StandaloneFormat), locale.standaloneMonthName(i, QLocale::LongFormat));
     }
 }
+QT_WARNING_POP
+#endif // textdate
 
 void tst_QDate::roundtrip() const
 {
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
index 9bb0c6811d..0b41af3371 100644
--- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
@@ -952,29 +952,42 @@ void tst_QLocale::stringToDouble()
 
 void tst_QLocale::stringToFloat_data()
 {
+    using Bounds = std::numeric_limits<float>;
     toReal_data();
-    if (std::numeric_limits<float>::has_infinity) {
-        double huge = std::numeric_limits<float>::infinity();
-        QTest::newRow("C inf") << QString("C") << QString("inf") << true << huge;
-        QTest::newRow("C +inf") << QString("C") << QString("+inf") << true << +huge;
-        QTest::newRow("C -inf") << QString("C") << QString("-inf") << true << -huge;
+    const QString C(QStringLiteral("C"));
+    if (Bounds::has_infinity) {
+        double huge = Bounds::infinity();
+        QTest::newRow("C inf") << C << QString("inf") << true << huge;
+        QTest::newRow("C +inf") << C << QString("+inf") << true << +huge;
+        QTest::newRow("C -inf") << C << QString("-inf") << true << -huge;
         // Overflow float, but not double:
-        QTest::newRow("C big") << QString("C") << QString("3.5e38") << false << huge;
-        QTest::newRow("C -big") << QString("C") << QString("-3.5e38") << false << -huge;
+        QTest::newRow("C big") << C << QString("3.5e38") << false << huge;
+        QTest::newRow("C -big") << C << QString("-3.5e38") << false << -huge;
         // Overflow double, too:
-        QTest::newRow("C huge") << QString("C") << QString("2e308") << false << huge;
-        QTest::newRow("C -huge") << QString("C") << QString("-2e308") << false << -huge;
+        QTest::newRow("C huge") << C << QString("2e308") << false << huge;
+        QTest::newRow("C -huge") << C << QString("-2e308") << false << -huge;
     }
-    if (std::numeric_limits<float>::has_quiet_NaN)
-        QTest::newRow("C qnan") << QString("C") << QString("NaN") << true << double(std::numeric_limits<float>::quiet_NaN());
+    if (Bounds::has_quiet_NaN)
+        QTest::newRow("C qnan") << C << QString("NaN") << true << double(Bounds::quiet_NaN());
+
+    // Minimal float: shouldn't underflow
+    QTest::newRow("C float min")
+        << C << QLocale::c().toString(Bounds::denorm_min()) << true << double(Bounds::denorm_min());
+    QTest::newRow("C float -min")
+        << C << QLocale::c().toString(-Bounds::denorm_min()) << true << -double(Bounds::denorm_min());
 
     // Underflow float, but not double:
-    QTest::newRow("C small") << QString("C") << QString("1e-45") << false << 0.;
-    QTest::newRow("C -small") << QString("C") << QString("-1e-45") << false << 0.;
+    QTest::newRow("C small") << C << QString("7e-46") << false << 0.;
+    QTest::newRow("C -small") << C << QString("-7e-46") << false << 0.;
+    using Double = std::numeric_limits<double>;
+    QTest::newRow("C double min")
+        << C << QLocale::c().toString(Double::denorm_min()) << false << 0.0;
+    QTest::newRow("C double -min")
+        << C << QLocale::c().toString(-Double::denorm_min()) << false << 0.0;
 
     // Underflow double, too:
-    QTest::newRow("C tiny") << QString("C") << QString("2e-324") << false << 0.;
-    QTest::newRow("C -tiny") << QString("C") << QString("-2e-324") << false << 0.;
+    QTest::newRow("C tiny") << C << QString("2e-324") << false << 0.;
+    QTest::newRow("C -tiny") << C << QString("-2e-324") << false << 0.;
 }
 
 void tst_QLocale::stringToFloat()
diff --git a/tests/auto/corelib/tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp b/tests/auto/corelib/tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp
index 656dd6a6e3..9b607db608 100644
--- a/tests/auto/corelib/tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp
+++ b/tests/auto/corelib/tools/qscopedvaluerollback/tst_qscopedvaluerollback.cpp
@@ -46,6 +46,7 @@ private Q_SLOTS:
     void rollbackToPreviousCommit();
     void exceptions();
     void earlyExitScope();
+    void moveOnly();
 private:
     void earlyExitScope_helper(int exitpoint, int &member);
 };
@@ -190,5 +191,17 @@ void tst_QScopedValueRollback::earlyExitScope_helper(int exitpoint, int& member)
     r.commit();
 }
 
+void tst_QScopedValueRollback::moveOnly()
+{
+    std::unique_ptr<int> uniquePtr;
+    std::unique_ptr<int> newVal(new int(5));
+    QVERIFY(!uniquePtr);
+    {
+        QScopedValueRollback<std::unique_ptr<int>> r(uniquePtr, std::move(newVal));
+        QVERIFY(uniquePtr);
+    }
+    QVERIFY(!uniquePtr);
+}
+
 QTEST_MAIN(tst_QScopedValueRollback)
 #include "tst_qscopedvaluerollback.moc"
diff --git a/tests/auto/corelib/tools/qtime/tst_qtime.cpp b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
index 3e5724213e..3403c5bf7f 100644
--- a/tests/auto/corelib/tools/qtime/tst_qtime.cpp
+++ b/tests/auto/corelib/tools/qtime/tst_qtime.cpp
@@ -95,8 +95,9 @@ void tst_QTime::addSecs_data()
 
     QTest::newRow("Data0") << QTime(0,0,0) << 200 << QTime(0,3,20);
     QTest::newRow("Data1") << QTime(0,0,0) << 20 << QTime(0,0,20);
-    QTest::newRow("overflow") << QTime(0,0,0) << (INT_MAX / 1000 + 1)
-                              << QTime(0,0,0).addSecs((INT_MAX / 1000 + 1) % 86400);
+    QTest::newRow("overflow")
+        << QTime(0,0,0) << (INT_MAX / 1000 + 1)
+        << QTime::fromMSecsSinceStartOfDay(((INT_MAX / 1000 + 1) % 86400) * 1000);
 }
 
 void tst_QTime::addSecs()
diff --git a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
index fc4cb717ec..e1bb3149c6 100644
--- a/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
+++ b/tests/auto/corelib/tools/qtimezone/tst_qtimezone.cpp
@@ -538,6 +538,8 @@ void tst_QTimeZone::checkOffset_data()
         int year, month, day, hour, min, sec;
         int std, dst;
     } table[] = {
+        // Zone with no transitions (QTBUG-74614, when TZ backend uses minimalist data)
+        { "Etc/UTC", "epoch", 1970, 1, 1, 0, 0, 0, 0, 0 },
         // Kiev: regression test for QTBUG-64122 (on MS):
         { "Europe/Kiev", "summer", 2017, 10, 27, 12, 0, 0, 2 * 3600, 3600 },
         { "Europe/Kiev", "winter", 2017, 10, 29, 12, 0, 0, 2 * 3600, 0 }
@@ -550,6 +552,8 @@ void tst_QTimeZone::checkOffset_data()
                 << QDateTime(QDate(entry.year, entry.month, entry.day),
                              QTime(entry.hour, entry.min, entry.sec), zone)
                 << entry.dst + entry.std << entry.std << entry.dst;
+        } else {
+            qWarning("Skipping %s@%s test as zone is invalid", entry.zone, entry.nick);
         }
     }
 }
diff --git a/tests/auto/corelib/tools/tools.pro b/tests/auto/corelib/tools/tools.pro
index 2a975e67d1..c6da33cce0 100644
--- a/tests/auto/corelib/tools/tools.pro
+++ b/tests/auto/corelib/tools/tools.pro
@@ -46,6 +46,7 @@ SUBDIRS=\
     qringbuffer \
     qscopedpointer \
     qscopedvaluerollback \
+    qscopeguard \
     qset \
     qsharedpointer \
     qsize \
diff --git a/tests/auto/gui/image/qimage/tst_qimage.cpp b/tests/auto/gui/image/qimage/tst_qimage.cpp
index 361055ce67..4d41b5e873 100644
--- a/tests/auto/gui/image/qimage/tst_qimage.cpp
+++ b/tests/auto/gui/image/qimage/tst_qimage.cpp
@@ -230,6 +230,8 @@ private slots:
 
     void convertColorTable();
 
+    void wideImage();
+
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
     void toWinHBITMAP_data();
     void toWinHBITMAP();
@@ -3282,11 +3284,46 @@ void tst_QImage::metadataPassthrough()
     QCOMPARE(mirrored.dotsPerMeterY(), a.dotsPerMeterY());
     QCOMPARE(mirrored.devicePixelRatio(), a.devicePixelRatio());
 
+    QTransform t;
+    t.rotate(90);
+    QImage rotated = a.transformed(t);
+    QCOMPARE(rotated.text(QStringLiteral("Test")), a.text(QStringLiteral("Test")));
+    QCOMPARE(rotated.dotsPerMeterX(), a.dotsPerMeterX());
+    QCOMPARE(rotated.dotsPerMeterY(), a.dotsPerMeterY());
+    QCOMPARE(rotated.devicePixelRatio(), a.devicePixelRatio());
+
     QImage swapped = a.rgbSwapped();
     QCOMPARE(swapped.text(QStringLiteral("Test")), a.text(QStringLiteral("Test")));
     QCOMPARE(swapped.dotsPerMeterX(), a.dotsPerMeterX());
     QCOMPARE(swapped.dotsPerMeterY(), a.dotsPerMeterY());
     QCOMPARE(swapped.devicePixelRatio(), a.devicePixelRatio());
+
+    QImage converted = a.convertToFormat(QImage::Format_RGB32);
+    QCOMPARE(converted.text(QStringLiteral("Test")), a.text(QStringLiteral("Test")));
+    QCOMPARE(converted.dotsPerMeterX(), a.dotsPerMeterX());
+    QCOMPARE(converted.dotsPerMeterY(), a.dotsPerMeterY());
+    QCOMPARE(converted.devicePixelRatio(), a.devicePixelRatio());
+
+    QImage copied = a.copy(0, 0, a.width() / 2, a.height() / 2);
+    QCOMPARE(copied.text(QStringLiteral("Test")), a.text(QStringLiteral("Test")));
+    QCOMPARE(copied.dotsPerMeterX(), a.dotsPerMeterX());
+    QCOMPARE(copied.dotsPerMeterY(), a.dotsPerMeterY());
+    QCOMPARE(copied.devicePixelRatio(), a.devicePixelRatio());
+
+    QImage alphaMask = a.createAlphaMask();
+    QCOMPARE(alphaMask.dotsPerMeterX(), a.dotsPerMeterX());
+    QCOMPARE(alphaMask.dotsPerMeterY(), a.dotsPerMeterY());
+    QCOMPARE(alphaMask.devicePixelRatio(), a.devicePixelRatio());
+
+    QImage heuristicMask = a.createHeuristicMask();
+    QCOMPARE(heuristicMask.dotsPerMeterX(), a.dotsPerMeterX());
+    QCOMPARE(heuristicMask.dotsPerMeterY(), a.dotsPerMeterY());
+    QCOMPARE(heuristicMask.devicePixelRatio(), a.devicePixelRatio());
+
+    QImage maskFromColor = a.createMaskFromColor(qRgb(0, 0, 0));
+    QCOMPARE(maskFromColor.dotsPerMeterX(), a.dotsPerMeterX());
+    QCOMPARE(maskFromColor.dotsPerMeterY(), a.dotsPerMeterY());
+    QCOMPARE(maskFromColor.devicePixelRatio(), a.devicePixelRatio());
 }
 
 void tst_QImage::pixelColor()
@@ -3559,6 +3596,24 @@ void tst_QImage::convertColorTable()
     QCOMPARE(rgb32.pixel(0,0), 0xffffffff);
 }
 
+void tst_QImage::wideImage()
+{
+    // QTBUG-73731 and QTBUG-73732
+    QImage i(538994187, 2, QImage::Format_ARGB32);
+    QImage i2(32, 32, QImage::Format_ARGB32);
+    i2.fill(Qt::white);
+
+    // Test that it doesn't crash:
+    QPainter painter(&i);
+    // With the composition mode is SourceOver out it's an invalid write
+    // With the composition mode is Source it's an invalid read
+    painter.drawImage(0, 0, i2);
+    painter.setCompositionMode(QPainter::CompositionMode_Source);
+    painter.drawImage(0, 0, i2);
+
+    // Qt6: Test that it actually works on 64bit architectures.
+}
+
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINRT)
 QT_BEGIN_NAMESPACE
 Q_GUI_EXPORT HBITMAP qt_imageToWinHBITMAP(const QImage &p, int hbitmapFormat = 0);
diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
index 9a338ad55a..4d31d80246 100644
--- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
+++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp
@@ -121,6 +121,7 @@ private slots:
 
     void copy();
     void deepCopyPreservesDpr();
+    void dprPassthrough();
     void depthOfNullObjects();
 
     void transformed();
@@ -1169,6 +1170,39 @@ void tst_QPixmap::deepCopyPreservesDpr()
     QCOMPARE(dest.devicePixelRatio(), dpr);
 }
 
+void tst_QPixmap::dprPassthrough()
+{
+    const qreal dpr = 2;
+    QPixmap src(32, 32);
+    src.setDevicePixelRatio(dpr);
+    src.fill(Qt::transparent);
+    QCOMPARE(src.devicePixelRatio(), dpr);
+
+    QImage img = src.toImage();
+    QCOMPARE(img.devicePixelRatio(), dpr);
+
+    QPixmap pm(1, 1);
+    pm.convertFromImage(img);
+    QCOMPARE(pm.devicePixelRatio(), dpr);
+
+    QBitmap heuristicMask = src.createHeuristicMask();
+    QCOMPARE(heuristicMask.devicePixelRatio(), dpr);
+
+    QBitmap maskFromColor = src.createMaskFromColor(Qt::white);
+    QCOMPARE(maskFromColor.devicePixelRatio(), dpr);
+
+    QBitmap mask = src.mask();
+    QCOMPARE(mask.devicePixelRatio(), dpr);
+
+    QPixmap scaled = src.scaled(16, 16);
+    QCOMPARE(scaled.devicePixelRatio(), dpr);
+
+    QTransform t;
+    t.rotate(90);
+    QPixmap transformed = src.transformed(t);
+    QCOMPARE(transformed.devicePixelRatio(), dpr);
+}
+
 void tst_QPixmap::depthOfNullObjects()
 {
     QBitmap b1;
diff --git a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
index cd3eaa1478..ce6ce15767 100644
--- a/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
+++ b/tests/auto/gui/painting/qbrush/tst_qbrush.cpp
@@ -345,6 +345,8 @@ void tst_QBrush::gradientPresets()
 
     QGradient invalidPreset(QGradient::Preset(-1));
     QCOMPARE(invalidPreset.type(), QGradient::NoGradient);
+    QBrush brush(invalidPreset);
+    QCOMPARE(brush.style(), Qt::NoBrush);
 }
 
 void fill(QPaintDevice *pd) {
diff --git a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
index 92384e85bc..182e3e9547 100644
--- a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
+++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
@@ -256,9 +256,14 @@ void tst_QAbstractNetworkCache::cacheControl_data()
     QTest::newRow("200-1") << QNetworkRequest::PreferNetwork << "httpcachetest_cachecontrol-expire.cgi" << false;
 
     QTest::newRow("200-2") << QNetworkRequest::AlwaysNetwork << "httpcachetest_cachecontrol.cgi?no-cache" << AlwaysFalse;
-    QTest::newRow("200-3") << QNetworkRequest::PreferNetwork << "httpcachetest_cachecontrol.cgi?no-cache" << false;
+    QTest::newRow("200-3") << QNetworkRequest::PreferNetwork << "httpcachetest_cachecontrol.cgi?no-cache" << true;
     QTest::newRow("200-4") << QNetworkRequest::AlwaysCache << "httpcachetest_cachecontrol.cgi?no-cache" << false;
-    QTest::newRow("200-5") << QNetworkRequest::PreferCache << "httpcachetest_cachecontrol.cgi?no-cache" << false;
+    QTest::newRow("200-5") << QNetworkRequest::PreferCache << "httpcachetest_cachecontrol.cgi?no-cache" << true;
+
+    QTest::newRow("200-6") << QNetworkRequest::AlwaysNetwork << "httpcachetest_cachecontrol.cgi?no-store" << AlwaysFalse;
+    QTest::newRow("200-7") << QNetworkRequest::PreferNetwork << "httpcachetest_cachecontrol.cgi?no-store" << false;
+    QTest::newRow("200-8") << QNetworkRequest::AlwaysCache << "httpcachetest_cachecontrol.cgi?no-store" << false;
+    QTest::newRow("200-9") << QNetworkRequest::PreferCache << "httpcachetest_cachecontrol.cgi?no-store" << false;
 
     QTest::newRow("304-0") << QNetworkRequest::PreferNetwork << "httpcachetest_cachecontrol.cgi?max-age=1000" << true;
 
diff --git a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
index 6c3443a735..45abb6aa05 100644
--- a/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
+++ b/tests/auto/network/access/qnetworkcookiejar/tst_qnetworkcookiejar.cpp
@@ -60,12 +60,15 @@ private slots:
 class MyCookieJar: public QNetworkCookieJar
 {
 public:
+    ~MyCookieJar() override;
     inline QList<QNetworkCookie> allCookies() const
         { return QNetworkCookieJar::allCookies(); }
     inline void setAllCookies(const QList<QNetworkCookie> &cookieList)
         { QNetworkCookieJar::setAllCookies(cookieList); }
 };
 
+MyCookieJar::~MyCookieJar() = default;
+
 void tst_QNetworkCookieJar::getterSetter()
 {
     MyCookieJar jar;
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 0d6828797a..eb956bec30 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -123,7 +123,7 @@ class tst_QNetworkReply: public QObject
         if (!seedCreated) {
             seedCreated = true; // not thread-safe, but who cares
         }
-        return QString::number(QTime(0, 0, 0).msecsTo(QTime::currentTime()))
+        return QString::number(QTime::currentTime().msecsSinceStartOfDay())
             + QLatin1Char('-') + QString::number(QCoreApplication::applicationPid())
             + QLatin1Char('-') + QString::number(QRandomGenerator::global()->generate());
     }
@@ -3976,7 +3976,7 @@ void tst_QNetworkReply::ioGetFromHttpWithCache_data()
             "HTTP/1.0 200\r\n"
             "Connection: keep-alive\r\n"
             "Content-Type: text/plain\r\n"
-            "Cache-control: no-cache\r\n"
+            "Cache-control: no-store\r\n"
             "Content-length: 8\r\n"
             "\r\n"
             "Reloaded";
@@ -4002,6 +4002,33 @@ void tst_QNetworkReply::ioGetFromHttpWithCache_data()
     content.second = "Not-reloaded";
     content.first.setLastModified(past);
 
+    // "no-cache"
+    rawHeaders.clear();
+    rawHeaders << QNetworkCacheMetaData::RawHeader("Date", QLocale::c().toString(past, dateFormat).toLatin1())
+            << QNetworkCacheMetaData::RawHeader("Cache-control", "no-cache");
+    content.first.setRawHeaders(rawHeaders);
+    content.first.setLastModified(past);
+    content.first.setExpirationDate(future);
+
+    // "no-cache" does not mean "no cache", just that we must consult remote first
+    QTest::newRow("no-cache,200,always-network")
+            << reply200 << "Reloaded" << content << int(QNetworkRequest::AlwaysNetwork) << QStringList() << false << true;
+    QTest::newRow("no-cache,200,prefer-network")
+            << reply200 << "Reloaded" << content << int(QNetworkRequest::PreferNetwork) << QStringList() << false << true;
+    QTest::newRow("no-cache,200,prefer-cache")
+            << reply200 << "Reloaded" << content << int(QNetworkRequest::PreferCache) << QStringList() << false << true;
+    // We're not allowed by the spec to deliver cached data without checking if it is still
+    // up-to-date.
+    QTest::newRow("no-cache,200,always-cache")
+            << reply200 << QString() << content << int(QNetworkRequest::AlwaysCache) << QStringList() << false << false;
+
+    QTest::newRow("no-cache,304,prefer-network")
+            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferNetwork) << QStringList() << true << true;
+    QTest::newRow("no-cache,304,prefer-cache")
+            << reply304 << "Not-reloaded" << content << int(QNetworkRequest::PreferCache) << QStringList() << true << true;
+    QTest::newRow("no-cache,304,always-cache")
+            << reply304 << QString() << content << int(QNetworkRequest::AlwaysCache) << QStringList() << false << false;
+
     //
     // Set to expired
     //
diff --git a/tests/auto/network/kernel/qhostinfo/BLACKLIST b/tests/auto/network/kernel/qhostinfo/BLACKLIST
index 87c5fe991f..cd4d4eb03c 100644
--- a/tests/auto/network/kernel/qhostinfo/BLACKLIST
+++ b/tests/auto/network/kernel/qhostinfo/BLACKLIST
@@ -4,3 +4,5 @@
 windows ci
 [blockingLookup:a-plus-aaaa]
 windows ci
+[reverseLookup:google-public-dns-a.google.com]
+ci
diff --git a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
index 059efae63d..f94756ed73 100644
--- a/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
+++ b/tests/auto/network/ssl/qsslkey/tst_qsslkey.cpp
@@ -474,11 +474,11 @@ void tst_QSslKey::passphraseChecks_data()
     QTest::newRow("DES") << QString(testDataDir + "rsa-with-passphrase-des.pem") << pass;
     QTest::newRow("3DES") << QString(testDataDir + "rsa-with-passphrase-3des.pem") << pass;
     QTest::newRow("RC2") << QString(testDataDir + "rsa-with-passphrase-rc2.pem") << pass;
-#if (!defined(QT_NO_OPENSSL) && !defined(OPENSSL_NO_AES)) || defined(QT_SECURETRANSPORT) || QT_CONFIG(schannel)
+#if (!defined(QT_NO_OPENSSL) && !defined(OPENSSL_NO_AES)) || (defined(QT_NO_OPENSSL) && QT_CONFIG(ssl))
     QTest::newRow("AES128") << QString(testDataDir + "rsa-with-passphrase-aes128.pem") << aesPass;
     QTest::newRow("AES192") << QString(testDataDir + "rsa-with-passphrase-aes192.pem") << aesPass;
     QTest::newRow("AES256") << QString(testDataDir + "rsa-with-passphrase-aes256.pem") << aesPass;
-#endif
+#endif // (OpenSSL && AES) || generic backend
 }
 
 void tst_QSslKey::passphraseChecks()
@@ -562,79 +562,135 @@ void tst_QSslKey::encrypt_data()
     QTest::addColumn<QByteArray>("key");
     QTest::addColumn<QByteArray>("plainText");
     QTest::addColumn<QByteArray>("cipherText");
+    QTest::addColumn<QByteArray>("iv");
 
+    QByteArray iv("abcdefgh");
     QTest::newRow("DES-CBC, length 0")
         << QSslKeyPrivate::DesCbc << QByteArray("01234567")
         << QByteArray()
-        << QByteArray::fromHex("956585228BAF9B1F");
+        << QByteArray::fromHex("956585228BAF9B1F")
+        << iv;
     QTest::newRow("DES-CBC, length 1")
         << QSslKeyPrivate::DesCbc << QByteArray("01234567")
         << QByteArray(1, 'a')
-        << QByteArray::fromHex("E6880AF202BA3C12");
+        << QByteArray::fromHex("E6880AF202BA3C12")
+        << iv;
     QTest::newRow("DES-CBC, length 2")
         << QSslKeyPrivate::DesCbc << QByteArray("01234567")
         << QByteArray(2, 'a')
-        << QByteArray::fromHex("A82492386EED6026");
+        << QByteArray::fromHex("A82492386EED6026")
+        << iv;
     QTest::newRow("DES-CBC, length 3")
         << QSslKeyPrivate::DesCbc << QByteArray("01234567")
         << QByteArray(3, 'a')
-        << QByteArray::fromHex("90B76D5B79519CBA");
+        << QByteArray::fromHex("90B76D5B79519CBA")
+        << iv;
     QTest::newRow("DES-CBC, length 4")
         << QSslKeyPrivate::DesCbc << QByteArray("01234567")
         << QByteArray(4, 'a')
-        << QByteArray::fromHex("63E3DD6FED87052A");
+        << QByteArray::fromHex("63E3DD6FED87052A")
+        << iv;
     QTest::newRow("DES-CBC, length 5")
         << QSslKeyPrivate::DesCbc << QByteArray("01234567")
         << QByteArray(5, 'a')
-        << QByteArray::fromHex("03ACDB0EACBDFA94");
+        << QByteArray::fromHex("03ACDB0EACBDFA94")
+        << iv;
     QTest::newRow("DES-CBC, length 6")
         << QSslKeyPrivate::DesCbc << QByteArray("01234567")
         << QByteArray(6, 'a')
-        << QByteArray::fromHex("7D95024E42A3A88A");
+        << QByteArray::fromHex("7D95024E42A3A88A")
+        << iv;
     QTest::newRow("DES-CBC, length 7")
         << QSslKeyPrivate::DesCbc << QByteArray("01234567")
         << QByteArray(7, 'a')
-        << QByteArray::fromHex("5003436B8A8E42E9");
+        << QByteArray::fromHex("5003436B8A8E42E9")
+        << iv;
     QTest::newRow("DES-CBC, length 8")
         << QSslKeyPrivate::DesCbc << QByteArray("01234567")
         << QByteArray(8, 'a')
-        << QByteArray::fromHex("E4C1F054BF5521C0A4A0FD4A2BC6C1B1");
+        << QByteArray::fromHex("E4C1F054BF5521C0A4A0FD4A2BC6C1B1")
+        << iv;
 
     QTest::newRow("DES-EDE3-CBC, length 0")
         << QSslKeyPrivate::DesEde3Cbc << QByteArray("0123456789abcdefghijklmn")
         << QByteArray()
-        << QByteArray::fromHex("3B2B4CD0B0FD495F");
+        << QByteArray::fromHex("3B2B4CD0B0FD495F")
+        << iv;
     QTest::newRow("DES-EDE3-CBC, length 8")
         << QSslKeyPrivate::DesEde3Cbc << QByteArray("0123456789abcdefghijklmn")
         << QByteArray(8, 'a')
-        << QByteArray::fromHex("F2A5A87763C54A72A3224103D90CDB03");
+        << QByteArray::fromHex("F2A5A87763C54A72A3224103D90CDB03")
+        << iv;
 
     QTest::newRow("RC2-40-CBC, length 0")
         << QSslKeyPrivate::Rc2Cbc << QByteArray("01234")
         << QByteArray()
-        << QByteArray::fromHex("6D05D52392FF6E7A");
+        << QByteArray::fromHex("6D05D52392FF6E7A")
+        << iv;
     QTest::newRow("RC2-40-CBC, length 8")
         << QSslKeyPrivate::Rc2Cbc << QByteArray("01234")
         << QByteArray(8, 'a')
-        << QByteArray::fromHex("75768E64C5749072A5D168F3AFEB0005");
+        << QByteArray::fromHex("75768E64C5749072A5D168F3AFEB0005")
+        << iv;
 
     QTest::newRow("RC2-64-CBC, length 0")
         << QSslKeyPrivate::Rc2Cbc << QByteArray("01234567")
         << QByteArray()
-        << QByteArray::fromHex("ADAE6BF70F420130");
+        << QByteArray::fromHex("ADAE6BF70F420130")
+        << iv;
     QTest::newRow("RC2-64-CBC, length 8")
         << QSslKeyPrivate::Rc2Cbc << QByteArray("01234567")
         << QByteArray(8, 'a')
-        << QByteArray::fromHex("C7BF5C80AFBE9FBEFBBB9FD935F6D0DF");
+        << QByteArray::fromHex("C7BF5C80AFBE9FBEFBBB9FD935F6D0DF")
+        << iv;
 
     QTest::newRow("RC2-128-CBC, length 0")
         << QSslKeyPrivate::Rc2Cbc << QByteArray("012345679abcdefg")
         << QByteArray()
-        << QByteArray::fromHex("1E965D483A13C8FB");
+        << QByteArray::fromHex("1E965D483A13C8FB")
+        << iv;
     QTest::newRow("RC2-128-CBC, length 8")
         << QSslKeyPrivate::Rc2Cbc << QByteArray("012345679abcdefg")
         << QByteArray(8, 'a')
-        << QByteArray::fromHex("5AEC1A5B295660B02613454232F7DECE");
+        << QByteArray::fromHex("5AEC1A5B295660B02613454232F7DECE")
+        << iv;
+
+#if (!defined(QT_NO_OPENSSL) && !defined(OPENSSL_NO_AES)) || (defined(QT_NO_OPENSSL) && QT_CONFIG(ssl))
+    // AES needs a longer IV
+    iv = QByteArray("abcdefghijklmnop");
+    QTest::newRow("AES-128-CBC, length 0")
+        << QSslKeyPrivate::Aes128Cbc << QByteArray("012345679abcdefg")
+        << QByteArray()
+        << QByteArray::fromHex("28DE1A9AA26601C30DD2527407121D1A")
+        << iv;
+    QTest::newRow("AES-128-CBC, length 8")
+        << QSslKeyPrivate::Aes128Cbc << QByteArray("012345679abcdefg")
+        << QByteArray(8, 'a')
+        << QByteArray::fromHex("08E880B1BA916F061C1E801D7F44D0EC")
+        << iv;
+
+    QTest::newRow("AES-192-CBC, length 0")
+        << QSslKeyPrivate::Aes192Cbc << QByteArray("0123456789abcdefghijklmn")
+        << QByteArray()
+        << QByteArray::fromHex("E169E0E205CDC2BA895B7CF6097673B1")
+        << iv;
+    QTest::newRow("AES-192-CBC, length 8")
+        << QSslKeyPrivate::Aes192Cbc << QByteArray("0123456789abcdefghijklmn")
+        << QByteArray(8, 'a')
+        << QByteArray::fromHex("3A227D6A3A13237316D30AA17FF9B0A7")
+        << iv;
+
+    QTest::newRow("AES-256-CBC, length 0")
+        << QSslKeyPrivate::Aes256Cbc << QByteArray("0123456789abcdefghijklmnopqrstuv")
+        << QByteArray()
+        << QByteArray::fromHex("4BAACAA0D22199C97DE206C465B7B14A")
+        << iv;
+    QTest::newRow("AES-256-CBC, length 8")
+        << QSslKeyPrivate::Aes256Cbc << QByteArray("0123456789abcdefghijklmnopqrstuv")
+        << QByteArray(8, 'a')
+        << QByteArray::fromHex("879C8C25EC135CDF0B14490A0A7C2F67")
+        << iv;
+#endif // (OpenSSL && AES) || generic backend
 }
 
 void tst_QSslKey::encrypt()
@@ -643,7 +699,7 @@ void tst_QSslKey::encrypt()
     QFETCH(QByteArray, key);
     QFETCH(QByteArray, plainText);
     QFETCH(QByteArray, cipherText);
-    QByteArray iv("abcdefgh");
+    QFETCH(QByteArray, iv);
 
 #if defined(Q_OS_WINRT) || QT_CONFIG(schannel)
     QEXPECT_FAIL("RC2-40-CBC, length 0", "WinRT/Schannel treats RC2 as 128-bit", Abort);
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 96c2f8ec42..7912063bc8 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -2139,7 +2139,7 @@ protected:
 
         // delayed reading data
         QTest::qSleep(100);
-        if (!socket->waitForReadyRead(2000))
+        if (!socket->waitForReadyRead(2000) && socket->bytesAvailable() == 0)
             return;             // error
         socket->readAll();
         dataReadSemaphore.release();
@@ -2210,7 +2210,7 @@ void tst_QSslSocket::waitForMinusOne()
     socket.write("How are you doing?");
     QVERIFY(socket.bytesToWrite() != 0);
     QVERIFY(socket.waitForBytesWritten(-1));
-    QVERIFY(server.dataReadSemaphore.tryAcquire(1, 2000));
+    QVERIFY(server.dataReadSemaphore.tryAcquire(1, 2500));
 
     // third verification: it should wait for 100 ms:
     QVERIFY(socket.waitForReadyRead(-1));
diff --git a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/BLACKLIST b/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/BLACKLIST
deleted file mode 100644
index c9b628d79b..0000000000
--- a/tests/auto/network/ssl/qsslsocket_onDemandCertificates_member/BLACKLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-[onDemandRootCertLoadingMemberMethods]
-linux
diff --git a/tests/auto/other/gestures/BLACKLIST b/tests/auto/other/gestures/BLACKLIST
index 269bac5750..c465ff316e 100644
--- a/tests/auto/other/gestures/BLACKLIST
+++ b/tests/auto/other/gestures/BLACKLIST
@@ -1,5 +1,6 @@
 []
 rhel-7.4
+rhel-7.6
 ubuntu-18.04
 [customGesture]
 # QTBUG-67254
diff --git a/tests/auto/other/qobjectrace/tst_qobjectrace.cpp b/tests/auto/other/qobjectrace/tst_qobjectrace.cpp
index 0d656e223c..22782f6b09 100644
--- a/tests/auto/other/qobjectrace/tst_qobjectrace.cpp
+++ b/tests/auto/other/qobjectrace/tst_qobjectrace.cpp
@@ -378,6 +378,10 @@ public:
         connect(timer, &QTimer::timeout, this, &DeleteReceiverRaceReceiver::onTimeout);
         timer->start(1);
     }
+    ~DeleteReceiverRaceReceiver()
+    {
+        delete receiver;
+    }
 
     void onTimeout()
     {
@@ -428,12 +432,12 @@ void tst_QObjectRace::disconnectRace()
 
         for (int i = 0; i < ThreadCount; ++i) {
             threads[i]->requestInterruption();
-            QVERIFY(threads[i]->wait(300));
+            QVERIFY(threads[i]->wait());
             delete threads[i];
         }
 
         senderThread->quit();
-        QVERIFY(senderThread->wait(300));
+        QVERIFY(senderThread->wait());
     }
 
     QCOMPARE(countedStructObjectsCount.load(), 0u);
@@ -453,11 +457,11 @@ void tst_QObjectRace::disconnectRace()
         QTest::qWait(TimeLimit);
 
         senderThread->requestInterruption();
-        QVERIFY(senderThread->wait(300));
+        QVERIFY(senderThread->wait());
 
         for (int i = 0; i < ThreadCount; ++i) {
             threads[i]->quit();
-            QVERIFY(threads[i]->wait(300));
+            QVERIFY(threads[i]->wait());
             delete threads[i];
         }
     }
diff --git a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
index 08c6039e37..be0285537e 100644
--- a/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
+++ b/tests/auto/sql/kernel/qsqlerror/tst_qsqlerror.cpp
@@ -46,6 +46,7 @@ private slots:
     void construction();
     void moveOperator();
     void operators();
+    void qtbug_74575();
 };
 
 tst_QSqlError::tst_QSqlError()
@@ -113,6 +114,7 @@ void tst_QSqlError::construction()
    QVERIFY(!obj4.isValid());
    QCOMPARE(obj4.driverText(), QString());
    QCOMPARE(obj4.databaseText(), QString());
+   QCOMPARE(obj4.text(), QString());
    QCOMPARE(obj4.type(), QSqlError::NoError);
    QCOMPARE(obj4.number(), -1);
    QCOMPARE(obj4.nativeErrorCode(), QString());
@@ -180,6 +182,28 @@ void tst_QSqlError::operators()
    QVERIFY(error1 != error3);
 }
 
+void tst_QSqlError::qtbug_74575()
+{
+   const QString driverText(QStringLiteral("drivertext"));
+   const QString databaseText(QStringLiteral("databasetext"));
+   const QString databaseTextNewline(QStringLiteral("databasetext\n"));
+
+   QSqlError error1(driverText, databaseText,
+                  QSqlError::UnknownError, QStringLiteral("123"));
+   QCOMPARE(error1.text(), databaseText + QLatin1Char(' ') + driverText);
+
+   QSqlError error2(QString(), databaseText,
+                  QSqlError::UnknownError, QStringLiteral("123"));
+   QCOMPARE(error2.text(), databaseText);
+
+   QSqlError error3(driverText, QString(),
+                  QSqlError::UnknownError, QStringLiteral("123"));
+   QCOMPARE(error3.text(), driverText);
+
+   QSqlError error4(driverText, databaseTextNewline,
+                  QSqlError::UnknownError, QStringLiteral("123"));
+   QCOMPARE(error4.text(), databaseTextNewline + driverText);
+}
 
 QTEST_MAIN(tst_QSqlError)
 #include "tst_qsqlerror.moc"
diff --git a/tests/auto/testlib/selftests/expected_globaldata.lightxml b/tests/auto/testlib/selftests/expected_globaldata.lightxml
index f66c4c552d..1212e4b364 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.lightxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.lightxml
@@ -12,174 +12,195 @@
 </TestFunction>
 <TestFunction name="testGlobal">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init testGlobal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init testGlobal local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[init testGlobal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[init testGlobal local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skip">
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1]]></DataTag>
+    <DataTag><![CDATA[global=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipLocal">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipLocal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init skipLocal local=false]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipLocal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init skipLocal local=true]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=true]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[init skipLocal local=false]]></Description>
+</Message>
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[skipping]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=false]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[init skipLocal local=true]]></Description>
+</Message>
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[skipping]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=true]]></Description>
 </Message>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipSingle">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init skipSingle local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init skipSingle local=true]]></Description>
 </Message>
-<Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[global: false local: true]]></Description>
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[Skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=true]]></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>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[init skipSingle local=false]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[skipping]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[Skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[init skipSingle local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.tap b/tests/auto/testlib/selftests/expected_globaldata.tap
index 580cf3a7a8..4d61b7437b 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.tap
+++ b/tests/auto/testlib/selftests/expected_globaldata.tap
@@ -2,51 +2,56 @@ TAP version 13
 # tst_globaldata
 # initTestCase initTestCase (null)
 ok 1 - initTestCase()
-# init testGlobal local 1
+# init testGlobal local=false
 # global: false
 # local: false
-# cleanup testGlobal local 1
-ok 2 - testGlobal(1:local 1)
-# init testGlobal local 2
+# cleanup testGlobal local=false
+ok 2 - testGlobal(global=false:local=false)
+# init testGlobal local=true
 # global: false
 # local: true
-# cleanup testGlobal local 2
-ok 3 - testGlobal(1:local 2)
-# init testGlobal local 1
+# cleanup testGlobal local=true
+ok 3 - testGlobal(global=false:local=true)
+# init testGlobal local=false
 # global: true
 # local: false
-# cleanup testGlobal local 1
-ok 4 - testGlobal(2:local 1)
-# init testGlobal local 2
+# cleanup testGlobal local=false
+ok 4 - testGlobal(global=true:local=false)
+# init testGlobal local=true
 # global: true
 # local: true
-# cleanup testGlobal local 2
-ok 5 - testGlobal(2:local 2)
-ok 6 - skip(1) # SKIP skipping
-# init skipLocal local 1
-ok 7 - skipLocal(1:local 1) # SKIP skipping
-# cleanup skipLocal local 1
-# init skipLocal local 2
-ok 8 - skipLocal(1:local 2) # SKIP skipping
-# cleanup skipLocal local 2
-# init skipSingle local 1
+# cleanup testGlobal local=true
+ok 5 - testGlobal(global=true:local=true)
+ok 6 - skip(global=false) # SKIP skipping
+# init skipLocal local=false
+ok 7 - skipLocal(global=false:local=false) # SKIP skipping
+# cleanup skipLocal local=false
+# init skipLocal local=true
+ok 8 - skipLocal(global=false:local=true) # SKIP skipping
+# cleanup skipLocal local=true
+# init skipLocal local=false
+ok 9 - skipLocal(global=true:local=false) # SKIP skipping
+# cleanup skipLocal local=false
+# init skipLocal local=true
+ok 10 - skipLocal(global=true:local=true) # SKIP skipping
+# cleanup skipLocal local=true
+# init skipSingle local=false
 # global: false local: false
-# cleanup skipSingle local 1
-ok 9 - skipSingle(1:local 1)
-# init skipSingle local 2
-# global: false local: true
-# cleanup skipSingle local 2
-ok 10 - skipSingle(1:local 2)
-# init skipSingle local 1
-ok 11 - skipSingle(2:local 1) # SKIP skipping
-# cleanup skipSingle local 1
-# init skipSingle local 2
+# cleanup skipSingle local=false
+ok 11 - skipSingle(global=false:local=false)
+# init skipSingle local=true
+ok 12 - skipSingle(global=false:local=true) # SKIP Skipping
+# cleanup skipSingle local=true
+# init skipSingle local=false
+ok 13 - skipSingle(global=true:local=false) # SKIP Skipping
+# cleanup skipSingle local=false
+# init skipSingle local=true
 # global: true local: true
-# cleanup skipSingle local 2
-ok 12 - skipSingle(2:local 2)
+# cleanup skipSingle local=true
+ok 14 - skipSingle(global=true:local=true)
 # cleanupTestCase cleanupTestCase (null)
-ok 13 - cleanupTestCase()
-1..13
-# tests 13
-# pass 9
+ok 15 - cleanupTestCase()
+1..15
+# tests 15
+# pass 8
 # fail 0
diff --git a/tests/auto/testlib/selftests/expected_globaldata.teamcity b/tests/auto/testlib/selftests/expected_globaldata.teamcity
index 5d623a3285..f76f6090ba 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.teamcity
+++ b/tests/auto/testlib/selftests/expected_globaldata.teamcity
@@ -2,30 +2,31 @@
 ##teamcity[testStarted name='initTestCase()' flowId='tst_globaldata']
 ##teamcity[testStdOut name='initTestCase()' out='QDEBUG: initTestCase initTestCase (null)' flowId='tst_globaldata']
 ##teamcity[testFinished name='initTestCase()' flowId='tst_globaldata']
-##teamcity[testStarted name='testGlobal(local 1)' flowId='tst_globaldata']
-##teamcity[testStdOut name='testGlobal(local 1)' out='QDEBUG: init testGlobal local 1|nQDEBUG: global: false|nQDEBUG: local: false|nQDEBUG: cleanup testGlobal local 1' flowId='tst_globaldata']
-##teamcity[testFinished name='testGlobal(local 1)' flowId='tst_globaldata']
-##teamcity[testStarted name='testGlobal(local 2)' flowId='tst_globaldata']
-##teamcity[testStdOut name='testGlobal(local 2)' out='QDEBUG: init testGlobal local 2|nQDEBUG: global: false|nQDEBUG: local: true|nQDEBUG: cleanup testGlobal local 2' flowId='tst_globaldata']
-##teamcity[testFinished name='testGlobal(local 2)' flowId='tst_globaldata']
-##teamcity[testStarted name='testGlobal(local 1)' flowId='tst_globaldata']
-##teamcity[testStdOut name='testGlobal(local 1)' out='QDEBUG: init testGlobal local 1|nQDEBUG: global: true|nQDEBUG: local: false|nQDEBUG: cleanup testGlobal local 1' flowId='tst_globaldata']
-##teamcity[testFinished name='testGlobal(local 1)' flowId='tst_globaldata']
-##teamcity[testStarted name='testGlobal(local 2)' flowId='tst_globaldata']
-##teamcity[testStdOut name='testGlobal(local 2)' out='QDEBUG: init testGlobal local 2|nQDEBUG: global: true|nQDEBUG: local: true|nQDEBUG: cleanup testGlobal local 2' flowId='tst_globaldata']
-##teamcity[testFinished name='testGlobal(local 2)' flowId='tst_globaldata']
+##teamcity[testStarted name='testGlobal(local=false)' flowId='tst_globaldata']
+##teamcity[testStdOut name='testGlobal(local=false)' out='QDEBUG: init testGlobal local=false|nQDEBUG: global: false|nQDEBUG: local: false|nQDEBUG: cleanup testGlobal local=false' flowId='tst_globaldata']
+##teamcity[testFinished name='testGlobal(local=false)' flowId='tst_globaldata']
+##teamcity[testStarted name='testGlobal(local=true)' flowId='tst_globaldata']
+##teamcity[testStdOut name='testGlobal(local=true)' out='QDEBUG: init testGlobal local=true|nQDEBUG: global: false|nQDEBUG: local: true|nQDEBUG: cleanup testGlobal local=true' flowId='tst_globaldata']
+##teamcity[testFinished name='testGlobal(local=true)' flowId='tst_globaldata']
+##teamcity[testStarted name='testGlobal(local=false)' flowId='tst_globaldata']
+##teamcity[testStdOut name='testGlobal(local=false)' out='QDEBUG: init testGlobal local=false|nQDEBUG: global: true|nQDEBUG: local: false|nQDEBUG: cleanup testGlobal local=false' flowId='tst_globaldata']
+##teamcity[testFinished name='testGlobal(local=false)' flowId='tst_globaldata']
+##teamcity[testStarted name='testGlobal(local=true)' flowId='tst_globaldata']
+##teamcity[testStdOut name='testGlobal(local=true)' out='QDEBUG: init testGlobal local=true|nQDEBUG: global: true|nQDEBUG: local: true|nQDEBUG: cleanup testGlobal local=true' flowId='tst_globaldata']
+##teamcity[testFinished name='testGlobal(local=true)' flowId='tst_globaldata']
 ##teamcity[testIgnored name='skip()' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
-##teamcity[testIgnored name='skipLocal(local 1)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
-##teamcity[testIgnored name='skipLocal(local 2)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
-##teamcity[testStarted name='skipSingle(local 1)' flowId='tst_globaldata']
-##teamcity[testStdOut name='skipSingle(local 1)' out='QDEBUG: init skipLocal local 1|nQDEBUG: cleanup skipLocal local 1|nQDEBUG: init skipLocal local 2|nQDEBUG: cleanup skipLocal local 2|nQDEBUG: init skipSingle local 1|nQDEBUG: global: false local: false|nQDEBUG: cleanup skipSingle local 1' flowId='tst_globaldata']
-##teamcity[testFinished name='skipSingle(local 1)' flowId='tst_globaldata']
-##teamcity[testStarted name='skipSingle(local 2)' flowId='tst_globaldata']
-##teamcity[testStdOut name='skipSingle(local 2)' out='QDEBUG: init skipSingle local 2|nQDEBUG: global: false local: true|nQDEBUG: cleanup skipSingle local 2' flowId='tst_globaldata']
-##teamcity[testFinished name='skipSingle(local 2)' flowId='tst_globaldata']
-##teamcity[testIgnored name='skipSingle(local 1)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
-##teamcity[testStdOut name='skipSingle(local 2)' out='QDEBUG: init skipSingle local 1|nQDEBUG: cleanup skipSingle local 1|nQDEBUG: init skipSingle local 2|nQDEBUG: global: true local: true|nQDEBUG: cleanup skipSingle local 2' flowId='tst_globaldata']
-##teamcity[testFinished name='skipSingle(local 2)' flowId='tst_globaldata']
+##teamcity[testIgnored name='skipLocal(local=false)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testIgnored name='skipLocal(local=true)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testIgnored name='skipLocal(local=false)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testIgnored name='skipLocal(local=true)' message='skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testStarted name='skipSingle(local=false)' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipSingle(local=false)' out='QDEBUG: init skipLocal local=false|nQDEBUG: cleanup skipLocal local=false|nQDEBUG: init skipLocal local=true|nQDEBUG: cleanup skipLocal local=true|nQDEBUG: init skipLocal local=false|nQDEBUG: cleanup skipLocal local=false|nQDEBUG: init skipLocal local=true|nQDEBUG: cleanup skipLocal local=true|nQDEBUG: init skipSingle local=false|nQDEBUG: global: false local: false|nQDEBUG: cleanup skipSingle local=false' flowId='tst_globaldata']
+##teamcity[testFinished name='skipSingle(local=false)' flowId='tst_globaldata']
+##teamcity[testIgnored name='skipSingle(local=true)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testIgnored name='skipSingle(local=false)' message='Skipping |[Loc: qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)|]' flowId='tst_globaldata']
+##teamcity[testStarted name='skipSingle(local=true)' flowId='tst_globaldata']
+##teamcity[testStdOut name='skipSingle(local=true)' out='QDEBUG: init skipSingle local=true|nQDEBUG: cleanup skipSingle local=true|nQDEBUG: init skipSingle local=false|nQDEBUG: cleanup skipSingle local=false|nQDEBUG: init skipSingle local=true|nQDEBUG: global: true local: true|nQDEBUG: cleanup skipSingle local=true' flowId='tst_globaldata']
+##teamcity[testFinished name='skipSingle(local=true)' flowId='tst_globaldata']
 ##teamcity[testStarted name='cleanupTestCase()' flowId='tst_globaldata']
 ##teamcity[testStdOut name='cleanupTestCase()' out='QDEBUG: cleanupTestCase cleanupTestCase (null)' flowId='tst_globaldata']
 ##teamcity[testFinished name='cleanupTestCase()' flowId='tst_globaldata']
diff --git a/tests/auto/testlib/selftests/expected_globaldata.txt b/tests/auto/testlib/selftests/expected_globaldata.txt
index b12f4a2a69..016b5e8299 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.txt
+++ b/tests/auto/testlib/selftests/expected_globaldata.txt
@@ -2,53 +2,61 @@
 Config: Using QtTest library
 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
-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
-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
-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
-PASS   : tst_globaldata::testGlobal(2:local 2)
-SKIP   : tst_globaldata::skip(1) skipping
+QDEBUG : tst_globaldata::testGlobal(global=false:local=false) init testGlobal local=false
+QDEBUG : tst_globaldata::testGlobal(global=false:local=false) global: false
+QDEBUG : tst_globaldata::testGlobal(global=false:local=false) local: false
+QDEBUG : tst_globaldata::testGlobal(global=false:local=false) cleanup testGlobal local=false
+PASS   : tst_globaldata::testGlobal(global=false:local=false)
+QDEBUG : tst_globaldata::testGlobal(global=false:local=true) init testGlobal local=true
+QDEBUG : tst_globaldata::testGlobal(global=false:local=true) global: false
+QDEBUG : tst_globaldata::testGlobal(global=false:local=true) local: true
+QDEBUG : tst_globaldata::testGlobal(global=false:local=true) cleanup testGlobal local=true
+PASS   : tst_globaldata::testGlobal(global=false:local=true)
+QDEBUG : tst_globaldata::testGlobal(global=true:local=false) init testGlobal local=false
+QDEBUG : tst_globaldata::testGlobal(global=true:local=false) global: true
+QDEBUG : tst_globaldata::testGlobal(global=true:local=false) local: false
+QDEBUG : tst_globaldata::testGlobal(global=true:local=false) cleanup testGlobal local=false
+PASS   : tst_globaldata::testGlobal(global=true:local=false)
+QDEBUG : tst_globaldata::testGlobal(global=true:local=true) init testGlobal local=true
+QDEBUG : tst_globaldata::testGlobal(global=true:local=true) global: true
+QDEBUG : tst_globaldata::testGlobal(global=true:local=true) local: true
+QDEBUG : tst_globaldata::testGlobal(global=true:local=true) cleanup testGlobal local=true
+PASS   : tst_globaldata::testGlobal(global=true:local=true)
+SKIP   : tst_globaldata::skip(global=false) skipping
    Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
-QDEBUG : tst_globaldata::skipLocal(1:local 1) init skipLocal local 1
-SKIP   : tst_globaldata::skipLocal(1:local 1) skipping
+QDEBUG : tst_globaldata::skipLocal(global=false:local=false) init skipLocal local=false
+SKIP   : tst_globaldata::skipLocal(global=false:local=false) skipping
    Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
-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
+QDEBUG : tst_globaldata::skipLocal(global=false:local=false) cleanup skipLocal local=false
+QDEBUG : tst_globaldata::skipLocal(global=false:local=true) init skipLocal local=true
+SKIP   : tst_globaldata::skipLocal(global=false:local=true) skipping
    Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
-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
-PASS   : tst_globaldata::skipSingle(1:local 2)
-QDEBUG : tst_globaldata::skipSingle(2:local 1) init skipSingle local 1
-SKIP   : tst_globaldata::skipSingle(2:local 1) skipping
+QDEBUG : tst_globaldata::skipLocal(global=false:local=true) cleanup skipLocal local=true
+QDEBUG : tst_globaldata::skipLocal(global=true:local=false) init skipLocal local=false
+SKIP   : tst_globaldata::skipLocal(global=true:local=false) skipping
    Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
-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::skipLocal(global=true:local=false) cleanup skipLocal local=false
+QDEBUG : tst_globaldata::skipLocal(global=true:local=true) init skipLocal local=true
+SKIP   : tst_globaldata::skipLocal(global=true:local=true) skipping
+   Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
+QDEBUG : tst_globaldata::skipLocal(global=true:local=true) cleanup skipLocal local=true
+QDEBUG : tst_globaldata::skipSingle(global=false:local=false) init skipSingle local=false
+QDEBUG : tst_globaldata::skipSingle(global=false:local=false) global: false local: false
+QDEBUG : tst_globaldata::skipSingle(global=false:local=false) cleanup skipSingle local=false
+PASS   : tst_globaldata::skipSingle(global=false:local=false)
+QDEBUG : tst_globaldata::skipSingle(global=false:local=true) init skipSingle local=true
+SKIP   : tst_globaldata::skipSingle(global=false:local=true) Skipping
+   Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
+QDEBUG : tst_globaldata::skipSingle(global=false:local=true) cleanup skipSingle local=true
+QDEBUG : tst_globaldata::skipSingle(global=true:local=false) init skipSingle local=false
+SKIP   : tst_globaldata::skipSingle(global=true:local=false) Skipping
+   Loc: [qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp(0)]
+QDEBUG : tst_globaldata::skipSingle(global=true:local=false) cleanup skipSingle local=false
+QDEBUG : tst_globaldata::skipSingle(global=true:local=true) init skipSingle local=true
+QDEBUG : tst_globaldata::skipSingle(global=true:local=true) global: true local: true
+QDEBUG : tst_globaldata::skipSingle(global=true:local=true) cleanup skipSingle local=true
+PASS   : tst_globaldata::skipSingle(global=true:local=true)
 QDEBUG : tst_globaldata::cleanupTestCase() cleanupTestCase cleanupTestCase (null)
 PASS   : tst_globaldata::cleanupTestCase()
-Totals: 9 passed, 0 failed, 4 skipped, 0 blacklisted, 0ms
+Totals: 8 passed, 0 failed, 7 skipped, 0 blacklisted, 0ms
 ********* Finished testing of tst_globaldata *********
diff --git a/tests/auto/testlib/selftests/expected_globaldata.xml b/tests/auto/testlib/selftests/expected_globaldata.xml
index 0f705ef352..9aa48c8f16 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.xml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xml
@@ -14,174 +14,195 @@
 </TestFunction>
 <TestFunction name="testGlobal">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init testGlobal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init testGlobal local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[global: false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[init testGlobal local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[init testGlobal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init testGlobal local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[init testGlobal local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <Description><![CDATA[global: true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[cleanup testGlobal local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skip">
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1]]></DataTag>
+    <DataTag><![CDATA[global=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipLocal">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipLocal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init skipLocal local=false]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipLocal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init skipLocal local=true]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
     <Description><![CDATA[skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipLocal local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=true]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[init skipLocal local=false]]></Description>
+</Message>
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[skipping]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=false]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[init skipLocal local=true]]></Description>
+</Message>
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[skipping]]></Description>
+</Message>
+<Message type="qdebug" file="" line="0">
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipLocal local=true]]></Description>
 </Message>
     <Duration msecs="0"/>
 </TestFunction>
 <TestFunction name="skipSingle">
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
-    <Description><![CDATA[init skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[init skipSingle local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=false]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[1:local 1]]></DataTag>
+    <DataTag><![CDATA[global=false:local=false]]></DataTag>
 </Incident>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[init skipSingle local=true]]></Description>
 </Message>
-<Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[global: false local: true]]></Description>
+<Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[Skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[1:local 2]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=false:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=true]]></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>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[init skipSingle local=false]]></Description>
 </Message>
 <Message type="skip" file="qtbase/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[skipping]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[Skipping]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 1]]></DataTag>
-    <Description><![CDATA[cleanup skipSingle local 1]]></Description>
+    <DataTag><![CDATA[global=true:local=false]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=false]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
-    <Description><![CDATA[init skipSingle local 2]]></Description>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[init skipSingle local=true]]></Description>
 </Message>
 <Message type="qdebug" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
     <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>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
+    <Description><![CDATA[cleanup skipSingle local=true]]></Description>
 </Message>
 <Incident type="pass" file="" line="0">
-    <DataTag><![CDATA[2:local 2]]></DataTag>
+    <DataTag><![CDATA[global=true:local=true]]></DataTag>
 </Incident>
     <Duration msecs="0"/>
 </TestFunction>
diff --git a/tests/auto/testlib/selftests/expected_globaldata.xunitxml b/tests/auto/testlib/selftests/expected_globaldata.xunitxml
index bdd7e3f00a..de184c2fdd 100644
--- a/tests/auto/testlib/selftests/expected_globaldata.xunitxml
+++ b/tests/auto/testlib/selftests/expected_globaldata.xunitxml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<testsuite errors="37" failures="0" tests="6" name="tst_globaldata">
+<testsuite errors="43" failures="0" tests="6" name="tst_globaldata">
   <properties>
     <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
     <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
@@ -9,88 +9,100 @@
     <!-- 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="global=false:local=false" message="init testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="global: false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="local: false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="init testGlobal local=true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="global: false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="local: true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="init testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="global: true" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="local: false" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="cleanup testGlobal local=false" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="init testGlobal local=true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="global: true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="local: true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="cleanup testGlobal local=true" type="qdebug" -->
   </testcase>
   <testcase name="skip">
-    <!-- tag="1" message="skipping" type="skip" -->
+    <!-- tag="global=false" message="skipping" type="skip" -->
   </testcase>
   <testcase name="skipLocal">
-    <!-- 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 2" message="skipping" type="skip" -->
-    <!-- tag="1:local 2" message="cleanup skipLocal local 2" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="init skipLocal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="skipping" type="skip" -->
+    <!-- tag="global=false:local=false" message="cleanup skipLocal local=false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="init skipLocal local=true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="skipping" type="skip" -->
+    <!-- tag="global=false:local=true" message="cleanup skipLocal local=true" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="init skipLocal local=false" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="skipping" type="skip" -->
+    <!-- tag="global=true:local=false" message="cleanup skipLocal local=false" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="init skipLocal local=true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="skipping" type="skip" -->
+    <!-- tag="global=true:local=true" message="cleanup skipLocal local=true" 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="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="global=false:local=false" message="init skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="global: false local: false" type="qdebug" -->
+    <!-- tag="global=false:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="init skipSingle local=true" type="qdebug" -->
+    <!-- tag="global=false:local=true" message="Skipping" type="skip" -->
+    <!-- tag="global=false:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="init skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=true:local=false" message="Skipping" type="skip" -->
+    <!-- tag="global=true:local=false" message="cleanup skipSingle local=false" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="init skipSingle local=true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="global: true local: true" type="qdebug" -->
+    <!-- tag="global=true:local=true" message="cleanup skipSingle local=true" type="qdebug" -->
   </testcase>
   <testcase result="pass" name="cleanupTestCase">
     <!-- message="cleanupTestCase cleanupTestCase (null)" type="qdebug" -->
   </testcase>
   <system-err>
 <![CDATA[initTestCase initTestCase (null)]]>
-<![CDATA[init testGlobal local 1]]>
+<![CDATA[init testGlobal local=false]]>
 <![CDATA[global: false]]>
 <![CDATA[local: false]]>
-<![CDATA[cleanup testGlobal local 1]]>
-<![CDATA[init testGlobal local 2]]>
+<![CDATA[cleanup testGlobal local=false]]>
+<![CDATA[init testGlobal local=true]]>
 <![CDATA[global: false]]>
 <![CDATA[local: true]]>
-<![CDATA[cleanup testGlobal local 2]]>
-<![CDATA[init testGlobal local 1]]>
+<![CDATA[cleanup testGlobal local=true]]>
+<![CDATA[init testGlobal local=false]]>
 <![CDATA[global: true]]>
 <![CDATA[local: false]]>
-<![CDATA[cleanup testGlobal local 1]]>
-<![CDATA[init testGlobal local 2]]>
+<![CDATA[cleanup testGlobal local=false]]>
+<![CDATA[init testGlobal local=true]]>
 <![CDATA[global: true]]>
 <![CDATA[local: true]]>
-<![CDATA[cleanup testGlobal local 2]]>
+<![CDATA[cleanup testGlobal local=true]]>
 <![CDATA[skipping]]>
-<![CDATA[init skipLocal local 1]]>
+<![CDATA[init skipLocal local=false]]>
 <![CDATA[skipping]]>
-<![CDATA[cleanup skipLocal local 1]]>
-<![CDATA[init skipLocal local 2]]>
+<![CDATA[cleanup skipLocal local=false]]>
+<![CDATA[init skipLocal local=true]]>
 <![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=true]]>
+<![CDATA[init skipLocal local=false]]>
+<![CDATA[skipping]]>
+<![CDATA[cleanup skipLocal local=false]]>
+<![CDATA[init skipLocal local=true]]>
 <![CDATA[skipping]]>
-<![CDATA[cleanup skipSingle local 1]]>
-<![CDATA[init skipSingle local 2]]>
+<![CDATA[cleanup skipLocal local=true]]>
+<![CDATA[init skipSingle local=false]]>
+<![CDATA[global: false local: false]]>
+<![CDATA[cleanup skipSingle local=false]]>
+<![CDATA[init skipSingle local=true]]>
+<![CDATA[Skipping]]>
+<![CDATA[cleanup skipSingle local=true]]>
+<![CDATA[init skipSingle local=false]]>
+<![CDATA[Skipping]]>
+<![CDATA[cleanup skipSingle local=false]]>
+<![CDATA[init skipSingle local=true]]>
 <![CDATA[global: true local: true]]>
-<![CDATA[cleanup skipSingle local 2]]>
+<![CDATA[cleanup skipSingle local=true]]>
 <![CDATA[cleanupTestCase cleanupTestCase (null)]]>
   </system-err>
 </testsuite>
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.lightxml b/tests/auto/testlib/selftests/expected_signaldumper.lightxml
new file mode 100644
index 0000000000..f68834e1a2
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_signaldumper.lightxml
@@ -0,0 +1,578 @@
+<Environment>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QtBuild/>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
+</Environment>
+<TestFunction name="initTestCase">
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: QThread(_POINTER_) started ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="noConnections">
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="oneSlot">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="oneSlotOldSyntax">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="twoSlots">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="twoSlotsOldSyntax">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="signalForwarding">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="signalForwardingOldSyntax">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) nestedSignal()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) nestedSignal()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="slotEmittingSignal">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="slotEmittingSignalOldSyntax">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) emitSecondSignal()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="variousTypes">
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]></Description>
+</Message>
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: QThread(_POINTER_) finished ()]]></Description>
+</Message>
+<Duration msecs="0"/>
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.tap b/tests/auto/testlib/selftests/expected_signaldumper.tap
new file mode 100644
index 0000000000..04d7d94745
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_signaldumper.tap
@@ -0,0 +1,151 @@
+TAP version 13
+# tst_Signaldumper
+# Signal: QThread(_POINTER_) started ()
+ok 1 - initTestCase()
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+ok 2 - noConnections()
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 3 - oneSlot(direct)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 4 - oneSlot(queued)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+#     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+#     Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+#     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 5 - oneSlotOldSyntax(direct)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 6 - oneSlotOldSyntax(queued)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 7 - twoSlots(direct)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 8 - twoSlots(queued)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+#     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+#     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+#     Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)
+#     Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+#     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+#     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 9 - twoSlotsOldSyntax(direct)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 10 - twoSlotsOldSyntax(queued)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+#     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+#     Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+#     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 11 - signalForwarding(direct)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+ok 12 - signalForwarding(queued)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+#     Slot: SignalSlotClass(_POINTER_) nestedSignal()
+#     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+#     Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)
+#     Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+#     Slot: SignalSlotClass(_POINTER_) nestedSignal()
+#     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 13 - signalForwardingOldSyntax(direct)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))
+# Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+ok 14 - signalForwardingOldSyntax(queued)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+#     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 15 - slotEmittingSignal(direct)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+ok 16 - slotEmittingSignal(queued)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+#     Slot: SignalSlotClass(_POINTER_) emitSecondSignal()
+#     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+ok 17 - slotEmittingSignalOldSyntax(direct)
+# Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+# Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+# Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+ok 18 - slotEmittingSignalOldSyntax(queued)
+# Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))
+# Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)
+# Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))
+# Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))
+# Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())
+# Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())
+# Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)
+# Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())
+# Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)
+# Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()
+# Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())
+# Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())
+ok 19 - variousTypes()
+ok 20 - cleanupTestCase()
+# Signal: QThread(_POINTER_) finished ()
+1..20
+# tests 20
+# pass 20
+# fail 0
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.teamcity b/tests/auto/testlib/selftests/expected_signaldumper.teamcity
new file mode 100644
index 0000000000..3b8cf8c54f
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_signaldumper.teamcity
@@ -0,0 +1,61 @@
+##teamcity[testSuiteStarted name='tst_Signaldumper' flowId='tst_Signaldumper']
+##teamcity[testStarted name='initTestCase()' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='initTestCase()' out='INFO: Signal: QThread(_POINTER_) started ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='initTestCase()' flowId='tst_Signaldumper']
+##teamcity[testStarted name='noConnections()' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='noConnections()' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))' flowId='tst_Signaldumper']
+##teamcity[testFinished name='noConnections()' flowId='tst_Signaldumper']
+##teamcity[testStarted name='oneSlot(direct)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='oneSlot(direct)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='oneSlot(direct)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='oneSlot(queued)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='oneSlot(queued)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='oneSlot(queued)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='oneSlotOldSyntax(direct)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='oneSlotOldSyntax(direct)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='oneSlotOldSyntax(direct)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='oneSlotOldSyntax(queued)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='oneSlotOldSyntax(queued)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='oneSlotOldSyntax(queued)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='twoSlots(direct)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='twoSlots(direct)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='twoSlots(direct)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='twoSlots(queued)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='twoSlots(queued)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='twoSlots(queued)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='twoSlotsOldSyntax(direct)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='twoSlotsOldSyntax(direct)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()|nINFO: Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)|nINFO: Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()|nINFO: Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='twoSlotsOldSyntax(direct)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='twoSlotsOldSyntax(queued)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='twoSlotsOldSyntax(queued)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='twoSlotsOldSyntax(queued)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='signalForwarding(direct)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='signalForwarding(direct)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='signalForwarding(direct)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='signalForwarding(queued)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='signalForwarding(queued)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='signalForwarding(queued)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='signalForwardingOldSyntax(direct)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='signalForwardingOldSyntax(direct)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Slot: SignalSlotClass(_POINTER_) nestedSignal()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Slot: SignalSlotClass(_POINTER_) nestedSignal()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='signalForwardingOldSyntax(direct)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='signalForwardingOldSyntax(queued)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='signalForwardingOldSyntax(queued)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))|nINFO: Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='signalForwardingOldSyntax(queued)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='slotEmittingSignal(direct)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='slotEmittingSignal(direct)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='slotEmittingSignal(direct)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='slotEmittingSignal(queued)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='slotEmittingSignal(queued)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='slotEmittingSignal(queued)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='slotEmittingSignalOldSyntax(direct)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='slotEmittingSignalOldSyntax(direct)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Slot: SignalSlotClass(_POINTER_) emitSecondSignal()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='slotEmittingSignalOldSyntax(direct)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='slotEmittingSignalOldSyntax(queued)' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='slotEmittingSignalOldSyntax(queued)' out='INFO: Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()|nINFO: Signal: QEventDispatcherPlatform(_POINTER_) awake ()|nINFO: Signal: SignalSlotClass(_POINTER_) nestedSignal ()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='slotEmittingSignalOldSyntax(queued)' flowId='tst_Signaldumper']
+##teamcity[testStarted name='variousTypes()' flowId='tst_Signaldumper']
+##teamcity[testStdOut name='variousTypes()' out='INFO: Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))|nINFO: Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))|nINFO: Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)|nINFO: Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())|nINFO: Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())' flowId='tst_Signaldumper']
+##teamcity[testFinished name='variousTypes()' flowId='tst_Signaldumper']
+##teamcity[testStarted name='cleanupTestCase()' flowId='tst_Signaldumper']
+##teamcity[testFinished name='cleanupTestCase()' flowId='tst_Signaldumper']
+##teamcity[testSuiteFinished name='tst_Signaldumper' flowId='tst_Signaldumper']
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.txt b/tests/auto/testlib/selftests/expected_signaldumper.txt
new file mode 100644
index 0000000000..f89c31afe5
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_signaldumper.txt
@@ -0,0 +1,149 @@
+********* Start testing of tst_Signaldumper *********
+Config: Using QtTest library
+INFO   : tst_Signaldumper::initTestCase() Signal: QThread(_POINTER_) started ()
+PASS   : tst_Signaldumper::initTestCase()
+INFO   : tst_Signaldumper::noConnections() Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::noConnections() Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+PASS   : tst_Signaldumper::noConnections()
+INFO   : tst_Signaldumper::oneSlot(direct) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::oneSlot(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::oneSlot(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::oneSlot(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::oneSlot(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::oneSlot(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::oneSlot(direct)
+INFO   : tst_Signaldumper::oneSlot(queued) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::oneSlot(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::oneSlot(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::oneSlot(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::oneSlot(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::oneSlot(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::oneSlot(queued)
+INFO   : tst_Signaldumper::oneSlotOldSyntax(direct) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::oneSlotOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+INFO   : tst_Signaldumper::oneSlotOldSyntax(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::oneSlotOldSyntax(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::oneSlotOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)
+INFO   : tst_Signaldumper::oneSlotOldSyntax(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::oneSlotOldSyntax(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::oneSlotOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+INFO   : tst_Signaldumper::oneSlotOldSyntax(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::oneSlotOldSyntax(direct)
+INFO   : tst_Signaldumper::oneSlotOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::oneSlotOldSyntax(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::oneSlotOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::oneSlotOldSyntax(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::oneSlotOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::oneSlotOldSyntax(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::oneSlotOldSyntax(queued)
+INFO   : tst_Signaldumper::twoSlots(direct) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::twoSlots(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::twoSlots(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::twoSlots(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::twoSlots(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::twoSlots(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::twoSlots(direct)
+INFO   : tst_Signaldumper::twoSlots(queued) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::twoSlots(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::twoSlots(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::twoSlots(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::twoSlots(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::twoSlots(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::twoSlots(queued)
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::twoSlotsOldSyntax(direct)
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::twoSlotsOldSyntax(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::twoSlotsOldSyntax(queued)
+INFO   : tst_Signaldumper::signalForwarding(direct) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::signalForwarding(direct)     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+INFO   : tst_Signaldumper::signalForwarding(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::signalForwarding(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwarding(direct)     Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwarding(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::signalForwarding(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwarding(direct)     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+INFO   : tst_Signaldumper::signalForwarding(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::signalForwarding(direct)
+INFO   : tst_Signaldumper::signalForwarding(queued) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::signalForwarding(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::signalForwarding(queued) Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+INFO   : tst_Signaldumper::signalForwarding(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwarding(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::signalForwarding(queued) Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwarding(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwarding(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::signalForwarding(queued) Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+PASS   : tst_Signaldumper::signalForwarding(queued)
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) nestedSignal()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct)     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct)     Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) nestedSignal()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct)     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::signalForwardingOldSyntax(direct)
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::signalForwardingOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+PASS   : tst_Signaldumper::signalForwardingOldSyntax(queued)
+INFO   : tst_Signaldumper::slotEmittingSignal(direct) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::slotEmittingSignal(direct)     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+INFO   : tst_Signaldumper::slotEmittingSignal(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::slotEmittingSignal(direct)
+INFO   : tst_Signaldumper::slotEmittingSignal(queued) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::slotEmittingSignal(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::slotEmittingSignal(queued) Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+PASS   : tst_Signaldumper::slotEmittingSignal(queued)
+INFO   : tst_Signaldumper::slotEmittingSignalOldSyntax(direct) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::slotEmittingSignalOldSyntax(direct)     Slot: SignalSlotClass(_POINTER_) emitSecondSignal()
+INFO   : tst_Signaldumper::slotEmittingSignalOldSyntax(direct)     Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+INFO   : tst_Signaldumper::slotEmittingSignalOldSyntax(direct) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+PASS   : tst_Signaldumper::slotEmittingSignalOldSyntax(direct)
+INFO   : tst_Signaldumper::slotEmittingSignalOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()
+INFO   : tst_Signaldumper::slotEmittingSignalOldSyntax(queued) Signal: QEventDispatcherPlatform(_POINTER_) awake ()
+INFO   : tst_Signaldumper::slotEmittingSignalOldSyntax(queued) Signal: SignalSlotClass(_POINTER_) nestedSignal ()
+PASS   : tst_Signaldumper::slotEmittingSignalOldSyntax(queued)
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())
+INFO   : tst_Signaldumper::variousTypes() Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())
+PASS   : tst_Signaldumper::variousTypes()
+PASS   : tst_Signaldumper::cleanupTestCase()
+INFO   : tst_Signaldumper::UnknownTestFunc() Signal: QThread(_POINTER_) finished ()
+Totals: 20 passed, 0 failed, 0 skipped, 0 blacklisted, 0ms
+********* Finished testing of tst_Signaldumper *********
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.xml b/tests/auto/testlib/selftests/expected_signaldumper.xml
new file mode 100644
index 0000000000..82959c62df
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_signaldumper.xml
@@ -0,0 +1,581 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<TestCase name="tst_Signaldumper">
+<Environment>
+    <QtVersion>@INSERT_QT_VERSION_HERE@</QtVersion>
+    <QtBuild/>
+    <QTestVersion>@INSERT_QT_VERSION_HERE@</QTestVersion>
+</Environment>
+<TestFunction name="initTestCase">
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: QThread(_POINTER_) started ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="noConnections">
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="oneSlot">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="oneSlotOldSyntax">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="twoSlots">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="twoSlotsOldSyntax">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="signalForwarding">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="signalForwardingOldSyntax">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) nestedSignal()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) nestedSignal()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="slotEmittingSignal">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="slotEmittingSignalOldSyntax">
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Slot: SignalSlotClass(_POINTER_) emitSecondSignal()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[direct]]></DataTag>
+</Incident>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]></Description>
+</Message>
+<Incident type="pass" file="" line="0">
+    <DataTag><![CDATA[queued]]></DataTag>
+</Incident>
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="variousTypes">
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]></Description>
+</Message>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]></Description>
+</Message>
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<TestFunction name="cleanupTestCase">
+<Incident type="pass" file="" line="0" />
+    <Duration msecs="0"/>
+</TestFunction>
+<Message type="info" file="" line="0">
+    <Description><![CDATA[Signal: QThread(_POINTER_) finished ()]]></Description>
+</Message>
+<Duration msecs="0"/>
+</TestCase>
diff --git a/tests/auto/testlib/selftests/expected_signaldumper.xunitxml b/tests/auto/testlib/selftests/expected_signaldumper.xunitxml
new file mode 100644
index 0000000000..930dc97262
--- /dev/null
+++ b/tests/auto/testlib/selftests/expected_signaldumper.xunitxml
@@ -0,0 +1,284 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<testsuite errors="125" failures="0" tests="12" name="tst_Signaldumper">
+  <properties>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QTestVersion"/>
+    <property value="@INSERT_QT_VERSION_HERE@" name="QtVersion"/>
+    <property value="" name="QtBuild"/>
+  </properties>
+  <testcase result="pass" name="initTestCase">
+    <!-- message="Signal: QThread(_POINTER_) started ()" type="info" -->
+  </testcase>
+  <testcase result="pass" name="noConnections">
+    <!-- message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+  </testcase>
+  <testcase result="pass" name="oneSlot">
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+  </testcase>
+  <testcase result="pass" name="oneSlotOldSyntax">
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+  </testcase>
+  <testcase result="pass" name="twoSlots">
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+  </testcase>
+  <testcase result="pass" name="twoSlotsOldSyntax">
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+  </testcase>
+  <testcase result="pass" name="signalForwarding">
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+  </testcase>
+  <testcase result="pass" name="signalForwardingOldSyntax">
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) nestedSignal()" type="info" -->
+    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)" type="info" -->
+    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) nestedSignal()" type="info" -->
+    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+  </testcase>
+  <testcase result="pass" name="slotEmittingSignal">
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+  </testcase>
+  <testcase result="pass" name="slotEmittingSignalOldSyntax">
+    <!-- tag="direct" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="direct" message="    Slot: SignalSlotClass(_POINTER_) emitSecondSignal()" type="info" -->
+    <!-- tag="direct" message="    Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+    <!-- tag="direct" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()" type="info" -->
+    <!-- tag="queued" message="Signal: QEventDispatcherPlatform(_POINTER_) awake ()" type="info" -->
+    <!-- tag="queued" message="Signal: SignalSlotClass(_POINTER_) nestedSignal ()" type="info" -->
+  </testcase>
+  <testcase result="pass" name="variousTypes">
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&amp;)@_POINTER_)" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qListSignal (QList&lt;int&gt;())" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector&lt;int&gt;())" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector&lt;int&gt;&amp;)@_POINTER_)" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector&lt;int&gt;())" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector&lt;int&gt;*)_POINTER_)" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" type="info" -->
+    <!-- message="Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())" type="info" -->
+  </testcase>
+  <testcase result="pass" name="cleanupTestCase">
+    <!-- message="Signal: QThread(_POINTER_) finished ()" type="info" -->
+  </testcase>
+  <system-err>
+<![CDATA[Signal: QThread(_POINTER_) started ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithParameters(int,char)]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) slotWithoutParameters()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) nestedSignal()]]>
+<![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) nestedSignalWithParameters(int,char)]]>
+<![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) nestedSignal()]]>
+<![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithParameters (int(242), char(m))]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[    Slot: SignalSlotClass(_POINTER_) emitSecondSignal()]]>
+<![CDATA[    Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) signalWithoutParameters ()]]>
+<![CDATA[Signal: QEventDispatcherPlatform(_POINTER_) awake ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) nestedSignal ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qStringSignal (QString(Test string))]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@_POINTER_)]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qStringConstRefSignal (QString(Test string))]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qByteArraySignal (QByteArray(Test bytearray))]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qListSignal (QList<int>())]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorSignal (QVector<int>())]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorRefSignal ((QVector<int>&)@_POINTER_)]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorConstRefSignal (QVector<int>())]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorConstPointerSignal ((const QVector<int>*)_POINTER_)]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qVectorPointerConstSignal ()]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]>
+<![CDATA[Signal: SignalSlotClass(_POINTER_) qVariantSignal (QVariant())]]>
+<![CDATA[Signal: QThread(_POINTER_) finished ()]]>
+  </system-err>
+</testsuite>
diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py
index 9ec87c8fc6..48ecbf0289 100755
--- a/tests/auto/testlib/selftests/generate_expected_output.py
+++ b/tests/auto/testlib/selftests/generate_expected_output.py
@@ -92,6 +92,17 @@ class Cleaner (object):
             (r'(Loc: \[[^[\]()]+)\(\d+\)', r'\1(0)'), # txt
             (r'(\[Loc: [^[\]()]+)\(\d+\)', r'\1(0)'), # teamcity
             (r'(<(?:Incident|Message)\b.*\bfile=.*\bline=)"\d+"', r'\1"0"'), # lightxml, xml
+            # Pointers printed by signal dumper:
+            (r'\(\b[a-f0-9]{8,}\b\)', r'(_POINTER_)'),
+            # Example/for reference:
+            # ((QString&)@55f5fbb8dd40)
+            # ((const QVector<int>*)7ffd671d4558)
+            (r'\((\((?:const )?\w+(?:<[^>]+>)?[*&]*\)@?)\b[a-f\d]{8,}\b\)', r'(\1_POINTER_)'),
+            # For xml output there is no '<', '>' or '&', so we need an alternate version for that:
+            # ((QVector&lt;int&gt;&amp;)@5608b455e640)
+            (r'\((\((?:const )?\w+(?:&lt;(?:[^&]|&(?!gt;))*&gt;)?(?:\*|&amp;)?\)@?)[a-z\d]+\b\)', r'(\1_POINTER_)'),
+            # QEventDispatcher{Glib,Win32,etc.}
+            (r'\bQEventDispatcher\w+\b', r'QEventDispatcherPlatform'),
             ),
                       precook = re.compile):
         """Private implementation details of __init__()."""
@@ -296,6 +307,7 @@ def generateTestData(testname, clean,
         "benchlibcounting": "-eventcounter",
         "printdatatags": "-datatags",
         "printdatatagswithglobaltags": "-datatags",
+        "signaldumper": "-vs",
         "silent": "-silent",
         "verbose1": "-v1",
         "verbose2": "-v2",
diff --git a/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp b/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
index 6c0ae1f43c..3c5c2c8f37 100644
--- a/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
+++ b/tests/auto/testlib/selftests/globaldata/tst_globaldata.cpp
@@ -66,9 +66,10 @@ void tst_globaldata::initTestCase()
 
 void tst_globaldata::initTestCase_data()
 {
-    QTest::addColumn<bool>("booli");
-    QTest::newRow("1") << false;
-    QTest::newRow("2") << true;
+    // QFETCH_GLOBAL shall iterate these, for every test:
+    QTest::addColumn<bool>("global");
+    QTest::newRow("global=false") << false;
+    QTest::newRow("global=true") << true;
 }
 
 void tst_globaldata::cleanupTestCase()
@@ -94,41 +95,42 @@ void tst_globaldata::cleanup()
 
 void tst_globaldata::testGlobal_data()
 {
-    QTest::addColumn<bool>("booll");
-    QTest::newRow("local 1") << false;
-    QTest::newRow("local 2") << true;
+    QTest::addColumn<bool>("local");
+    QTest::newRow("local=false") << false;
+    QTest::newRow("local=true") << true;
 }
 
 void tst_globaldata::testGlobal()
 {
-    QFETCH_GLOBAL(bool, booli);
-    qDebug() << "global:" << booli;
-    QFETCH(bool, booll);
-    qDebug() << "local:" << booll;
+    QFETCH_GLOBAL(bool, global);
+    qDebug() << "global:" << global;
+    QFETCH(bool, local);
+    qDebug() << "local:" << local;
 }
 
 void tst_globaldata::skip_data()
 {
-    QTest::addColumn<bool>("booll");
-    QTest::newRow("local 1") << false;
-    QTest::newRow("local 2") << true;
-
+    testGlobal_data();
     QSKIP("skipping");
 }
 
 void tst_globaldata::skip()
 {
-    qDebug() << "this line should never be reached";
+    // A skip in _data() causes the whole test to be skipped, for all global rows.
+    QVERIFY(!"This line should never be reached.");
 }
 
 void tst_globaldata::skipSingle()
 {
-    QFETCH_GLOBAL(bool, booli);
-    QFETCH(bool, booll);
-
-    if (booli && !booll)
-        QSKIP("skipping");
-    qDebug() << "global:" << booli << "local:" << booll;
+    QFETCH_GLOBAL(bool, global);
+    QFETCH(bool, local);
+
+    // A skip in the last run of one global row used to suppress the test in the
+    // next global row (where a skip in an earlier run of the first row did not).
+    if (global ^ local)
+        QSKIP("Skipping");
+    qDebug() << "global:" << global << "local:" << local;
+    QCOMPARE(global, local);
 }
 
 void tst_globaldata::skipLocal()
diff --git a/tests/auto/testlib/selftests/selftests.pri b/tests/auto/testlib/selftests/selftests.pri
index 57b41bb5fc..2cad0b7e17 100644
--- a/tests/auto/testlib/selftests/selftests.pri
+++ b/tests/auto/testlib/selftests/selftests.pri
@@ -36,6 +36,7 @@ SUBPROGRAMS = \
      printdatatagswithglobaltags \
      qexecstringlist \
      silent \
+     signaldumper \
      singleskip \
      skip \
      skipcleanup \
diff --git a/tests/auto/testlib/selftests/signaldumper/signaldumper.pro b/tests/auto/testlib/selftests/signaldumper/signaldumper.pro
new file mode 100644
index 0000000000..8780b18419
--- /dev/null
+++ b/tests/auto/testlib/selftests/signaldumper/signaldumper.pro
@@ -0,0 +1,9 @@
+SOURCES += tst_signaldumper.cpp
+QT = core testlib-private
+
+macos:CONFIG -= app_bundle
+CONFIG -= debug_and_release_target
+
+TARGET = signaldumper
+
+include($$QT_SOURCE_TREE/src/testlib/selfcover.pri)
diff --git a/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp b/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp
new file mode 100644
index 0000000000..f6cd0d510e
--- /dev/null
+++ b/tests/auto/testlib/selftests/signaldumper/tst_signaldumper.cpp
@@ -0,0 +1,417 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:GPL-EXCEPT$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QtCore/QCoreApplication>
+#include <QtTest/QtTest>
+#include <private/qtestlog_p.h>
+
+class tst_Signaldumper : public QObject
+{
+    Q_OBJECT
+
+    void addConnectionTypeData();
+
+private slots:
+    void noConnections();
+    void oneSlot_data();
+    void oneSlot();
+    void oneSlotOldSyntax_data();
+    void oneSlotOldSyntax();
+    void twoSlots_data();
+    void twoSlots();
+    void twoSlotsOldSyntax_data();
+    void twoSlotsOldSyntax();
+    void signalForwarding_data();
+    void signalForwarding();
+    void signalForwardingOldSyntax_data();
+    void signalForwardingOldSyntax();
+    void slotEmittingSignal_data();
+    void slotEmittingSignal();
+    void slotEmittingSignalOldSyntax_data();
+    void slotEmittingSignalOldSyntax();
+
+    void variousTypes();
+};
+
+void tst_Signaldumper::addConnectionTypeData()
+{
+    QTest::addColumn<Qt::ConnectionType>("connectionType");
+    QTest::newRow("direct") << Qt::ConnectionType::DirectConnection;
+    QTest::newRow("queued") << Qt::ConnectionType::QueuedConnection;
+}
+
+/*
+    Simple class to keep the slots and signals separate from the test
+*/
+class SignalSlotClass : public QObject
+{
+    Q_OBJECT
+
+public:
+    SignalSlotClass();
+
+public slots:
+    void slotWithoutParameters() {}
+    void slotWithParameters(int i, char c) { Q_UNUSED(i); Q_UNUSED(c); }
+    void emitSecondSignal() { emit nestedSignal(); }
+
+signals:
+    void signalWithoutParameters();
+    void signalWithParameters(int i, char c);
+
+    void nestedSignal();
+    void nestedSignalWithParameters(int i, char c);
+
+    // For the "variousTypes" test
+    void qStringSignal(QString string);
+    void qStringRefSignal(QString &string);
+    void qStringConstRefSignal(const QString &string);
+    void qByteArraySignal(QByteArray byteArray);
+    void qListSignal(QList<int> list);
+    void qVectorSignal(QVector<int> vector);
+    void qVectorRefSignal(QVector<int> &vector);
+    void qVectorConstRefSignal(const QVector<int> &vector);
+    void qVectorConstPointerSignal(const QVector<int> *vector);
+    void qVectorPointerConstSignal(QVector<int> *const vector);
+    void qVariantSignal(QVariant variant);
+};
+
+SignalSlotClass::SignalSlotClass()
+{
+    // For printing signal argument in "variousTypes" test
+    qRegisterMetaType<QVector<int>>();
+    qRegisterMetaType<QList<int>>();
+}
+
+void tst_Signaldumper::noConnections()
+{
+    SignalSlotClass signalSlotOwner;
+
+    emit signalSlotOwner.signalWithoutParameters();
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+}
+
+void tst_Signaldumper::oneSlot_data()
+{
+    addConnectionTypeData();
+}
+
+void tst_Signaldumper::oneSlot()
+{
+    QFETCH(Qt::ConnectionType, connectionType);
+
+    SignalSlotClass signalSlotOwner;
+    // parameterless to parameterless
+    auto connection = connect(&signalSlotOwner, &SignalSlotClass::signalWithoutParameters,
+                              &signalSlotOwner, &SignalSlotClass::slotWithoutParameters, connectionType);
+    emit signalSlotOwner.signalWithoutParameters();
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+
+    // parameters to parameters
+    connection = connect(&signalSlotOwner, &SignalSlotClass::signalWithParameters,
+                         &signalSlotOwner, &SignalSlotClass::slotWithParameters, connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+
+    // parameters to no parameters
+    connection = connect(&signalSlotOwner, &SignalSlotClass::signalWithParameters,
+                         &signalSlotOwner, &SignalSlotClass::slotWithoutParameters, connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+}
+
+void tst_Signaldumper::oneSlotOldSyntax_data()
+{
+    addConnectionTypeData();
+}
+
+void tst_Signaldumper::oneSlotOldSyntax()
+{
+    QFETCH(Qt::ConnectionType, connectionType);
+
+    SignalSlotClass signalSlotOwner;
+    // parameterless to parameterless
+    auto connection = connect(&signalSlotOwner, SIGNAL(signalWithoutParameters()),
+                              &signalSlotOwner, SLOT(slotWithoutParameters()), connectionType);
+    emit signalSlotOwner.signalWithoutParameters();
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+
+    // parameters to parameters
+    connection = connect(&signalSlotOwner, SIGNAL(signalWithParameters(int, char)),
+                         &signalSlotOwner, SLOT(slotWithParameters(int, char)), connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+
+    // parameters to no parameters
+    connection = connect(&signalSlotOwner, SIGNAL(signalWithParameters(int, char)),
+                         &signalSlotOwner, SLOT(slotWithoutParameters()), connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+}
+
+void tst_Signaldumper::twoSlots_data()
+{
+    addConnectionTypeData();
+}
+
+void tst_Signaldumper::twoSlots()
+{
+    QFETCH(Qt::ConnectionType, connectionType);
+
+    // Now, instead of creating two slots or two objects, we will just do the same connection twice.
+    // The same slot will then be invoked twice.
+
+    SignalSlotClass signalSlotOwner;
+    // parameterless to parameterless
+    auto connection = connect(&signalSlotOwner, &SignalSlotClass::signalWithoutParameters,
+                              &signalSlotOwner, &SignalSlotClass::slotWithoutParameters, connectionType);
+    auto connection2 = connect(&signalSlotOwner, &SignalSlotClass::signalWithoutParameters,
+                              &signalSlotOwner, &SignalSlotClass::slotWithoutParameters, connectionType);
+    emit signalSlotOwner.signalWithoutParameters();
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+    disconnect(connection2);
+
+    // parameters to parameters
+    connection = connect(&signalSlotOwner, &SignalSlotClass::signalWithParameters,
+                         &signalSlotOwner, &SignalSlotClass::slotWithParameters, connectionType);
+    connection2 = connect(&signalSlotOwner, &SignalSlotClass::signalWithParameters,
+                         &signalSlotOwner, &SignalSlotClass::slotWithParameters, connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+    disconnect(connection2);
+
+    // parameters to no parameters
+    connection = connect(&signalSlotOwner, &SignalSlotClass::signalWithParameters,
+                         &signalSlotOwner, &SignalSlotClass::slotWithoutParameters, connectionType);
+    connection2 = connect(&signalSlotOwner, &SignalSlotClass::signalWithParameters,
+                         &signalSlotOwner, &SignalSlotClass::slotWithoutParameters, connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+    disconnect(connection2);
+}
+
+void tst_Signaldumper::twoSlotsOldSyntax_data()
+{
+    addConnectionTypeData();
+}
+
+void tst_Signaldumper::twoSlotsOldSyntax()
+{
+    QFETCH(Qt::ConnectionType, connectionType);
+
+    // Now, instead of creating two slots or two objects, we will just do the same connection twice.
+    // The same slot will then be invoked twice.
+
+    SignalSlotClass signalSlotOwner;
+    // parameterless to parameterless
+    auto connection = connect(&signalSlotOwner, SIGNAL(signalWithoutParameters()),
+                              &signalSlotOwner, SLOT(slotWithoutParameters()), connectionType);
+    auto connection2 = connect(&signalSlotOwner, SIGNAL(signalWithoutParameters()),
+                              &signalSlotOwner, SLOT(slotWithoutParameters()), connectionType);
+    emit signalSlotOwner.signalWithoutParameters();
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+    disconnect(connection2);
+
+    // parameters to parameters
+    connection = connect(&signalSlotOwner, SIGNAL(signalWithParameters(int, char)),
+                         &signalSlotOwner, SLOT(slotWithParameters(int, char)), connectionType);
+    connection2 = connect(&signalSlotOwner, SIGNAL(signalWithParameters(int, char)),
+                         &signalSlotOwner, SLOT(slotWithParameters(int, char)), connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+    disconnect(connection2);
+
+    // parameters to no parameters
+    connection = connect(&signalSlotOwner, SIGNAL(signalWithParameters(int, char)),
+                         &signalSlotOwner, SLOT(slotWithoutParameters()), connectionType);
+    connection2 = connect(&signalSlotOwner, SIGNAL(signalWithParameters(int, char)),
+                         &signalSlotOwner, SLOT(slotWithoutParameters()), connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+    disconnect(connection2);
+}
+
+void tst_Signaldumper::signalForwarding_data()
+{
+    addConnectionTypeData();
+}
+
+void tst_Signaldumper::signalForwarding()
+{
+    QFETCH(Qt::ConnectionType, connectionType);
+
+    SignalSlotClass signalSlotOwner;
+
+    // parameterless signal to parameterless signal
+    auto connection = connect(&signalSlotOwner, &SignalSlotClass::signalWithoutParameters,
+                              &signalSlotOwner, &SignalSlotClass::nestedSignal, connectionType);
+    emit signalSlotOwner.signalWithoutParameters();
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+
+    // parameter(full) signal to parameter(full) signal
+    connection = connect(&signalSlotOwner, &SignalSlotClass::signalWithParameters,
+                         &signalSlotOwner, &SignalSlotClass::nestedSignalWithParameters, connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+
+    // parameter(full) signal to parameterless signal
+    connection = connect(&signalSlotOwner, &SignalSlotClass::signalWithParameters,
+                         &signalSlotOwner, &SignalSlotClass::nestedSignal, connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+}
+
+void tst_Signaldumper::signalForwardingOldSyntax_data()
+{
+    addConnectionTypeData();
+}
+
+void tst_Signaldumper::signalForwardingOldSyntax()
+{
+    QFETCH(Qt::ConnectionType, connectionType);
+
+    SignalSlotClass signalSlotOwner;
+
+    // parameterless signal to parameterless signal
+    auto connection = connect(&signalSlotOwner, SIGNAL(signalWithoutParameters()),
+                              &signalSlotOwner, SIGNAL(nestedSignal()), connectionType);
+    emit signalSlotOwner.signalWithoutParameters();
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+
+    // parameter(full) signal to parameter(full) signal
+    connection = connect(&signalSlotOwner, SIGNAL(signalWithParameters(int, char)),
+                         &signalSlotOwner, SIGNAL(nestedSignalWithParameters(int, char)), connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+
+    // parameter(full) signal to parameterless signal
+    connection = connect(&signalSlotOwner, SIGNAL(signalWithParameters(int, char)),
+                         &signalSlotOwner, SIGNAL(nestedSignal()), connectionType);
+    emit signalSlotOwner.signalWithParameters(242, 'm');
+
+    QCoreApplication::processEvents();
+    disconnect(connection);
+}
+
+void tst_Signaldumper::slotEmittingSignal_data()
+{
+    addConnectionTypeData();
+}
+
+void tst_Signaldumper::slotEmittingSignal()
+{
+    QFETCH(Qt::ConnectionType, connectionType);
+
+    SignalSlotClass signalSlotOwner;
+
+    auto connection = connect(&signalSlotOwner, &SignalSlotClass::signalWithoutParameters,
+                              &signalSlotOwner, &SignalSlotClass::emitSecondSignal, connectionType);
+    emit signalSlotOwner.signalWithoutParameters();
+    QCoreApplication::processEvents();
+    disconnect(connection);
+}
+
+void tst_Signaldumper::slotEmittingSignalOldSyntax_data()
+{
+    addConnectionTypeData();
+}
+
+void tst_Signaldumper::slotEmittingSignalOldSyntax()
+{
+    QFETCH(Qt::ConnectionType, connectionType);
+
+    SignalSlotClass signalSlotOwner;
+
+    auto connection = connect(&signalSlotOwner, SIGNAL(signalWithoutParameters()),
+                              &signalSlotOwner, SLOT(emitSecondSignal()), connectionType);
+    emit signalSlotOwner.signalWithoutParameters();
+    QCoreApplication::processEvents();
+    disconnect(connection);
+}
+
+void tst_Signaldumper::variousTypes()
+{
+    SignalSlotClass signalSlotOwner;
+    QString string = QString::fromLatin1("Test string");
+    emit signalSlotOwner.qStringSignal(string);
+    emit signalSlotOwner.qStringRefSignal(string);
+    emit signalSlotOwner.qStringConstRefSignal(string);
+    emit signalSlotOwner.qByteArraySignal(QByteArray("Test bytearray"));
+
+    QList<int> list{1, 2, 3, 242};
+    emit signalSlotOwner.qListSignal(list);
+
+    QVector<int> vector{1, 2, 3, 242};
+    emit signalSlotOwner.qVectorSignal(vector);
+    emit signalSlotOwner.qVectorRefSignal(vector);
+    emit signalSlotOwner.qVectorConstRefSignal(vector);
+    emit signalSlotOwner.qVectorConstPointerSignal(&vector);
+    emit signalSlotOwner.qVectorPointerConstSignal(&vector);
+
+    QVariant variant = 24;
+    emit signalSlotOwner.qVariantSignal(variant);
+    variant = QVariant(string);
+    emit signalSlotOwner.qVariantSignal(variant);
+}
+
+QTEST_MAIN(tst_Signaldumper)
+#include "tst_signaldumper.moc"
diff --git a/tests/auto/testlib/selftests/tst_selftests.cpp b/tests/auto/testlib/selftests/tst_selftests.cpp
index 3a242d0493..1326b96177 100644
--- a/tests/auto/testlib/selftests/tst_selftests.cpp
+++ b/tests/auto/testlib/selftests/tst_selftests.cpp
@@ -487,6 +487,7 @@ void tst_Selftests::runSubTest_data()
         << "printdatatags"
         << "printdatatagswithglobaltags"
         << "qexecstringlist"
+        << "signaldumper"
         << "silent"
         << "singleskip"
         << "skip"
@@ -552,6 +553,9 @@ void tst_Selftests::runSubTest_data()
             else if (subtest == "printdatatagswithglobaltags") {
                 arguments << "-datatags";
             }
+            else if (subtest == "signaldumper") {
+                arguments << "-vs";
+            }
             else if (subtest == "silent") {
                 arguments << "-silent";
             }
@@ -952,6 +956,29 @@ bool tst_Selftests::compareLine(const QString &logger, const QString &subdir,
     if (actualLine.startsWith(QLatin1String("Totals:")) && expectedLine.startsWith(QLatin1String("Totals:")))
         return true;
 
+    const QLatin1String pointerPlaceholder("_POINTER_");
+    if (expectedLine.contains(pointerPlaceholder)
+        && (expectedLine.contains(QLatin1String("Signal: "))
+            || expectedLine.contains(QLatin1String("Slot: ")))) {
+        QString actual = actualLine;
+        // We don't care about the pointer of the object to whom the signal belongs, so we
+        // replace it with _POINTER_, e.g.:
+        // Signal: SignalSlotClass(7ffd72245410) signalWithoutParameters ()
+        // Signal: QThread(7ffd72245410) started ()
+        // After this instance pointer we may have further pointers and
+        // references (with an @ prefix) as parameters of the signal or
+        // slot being invoked.
+        // Signal: SignalSlotClass(_POINTER_) qStringRefSignal ((QString&)@55f5fbb8dd40)
+        actual.replace(QRegularExpression("\\b[a-f0-9]{8,}\\b"), pointerPlaceholder);
+        // Also change QEventDispatcher{Glib,Win32,etc.} to QEventDispatcherPlatform
+        actual.replace(QRegularExpression("\\b(QEventDispatcher)\\w+\\b"), QLatin1String("\\1Platform"));
+        if (actual != expectedLine) {
+          *errorMessage = msgMismatch(actual, expectedLine);
+          return false;
+        }
+        return true;
+    }
+
     *errorMessage = msgMismatch(actualLine, expectedLine);
     return false;
 }
diff --git a/tests/auto/tools/qmake/testcompiler.cpp b/tests/auto/tools/qmake/testcompiler.cpp
index da76b3f2ca..0a7ba3b40b 100644
--- a/tests/auto/tools/qmake/testcompiler.cpp
+++ b/tests/auto/tools/qmake/testcompiler.cpp
@@ -31,7 +31,7 @@
 #include <QProcess>
 #include <QDir>
 
-static QString targetName( BuildType buildMode, const QString& target, const QString& version )
+QString TestCompiler::targetName(BuildType buildMode, const QString& target, const QString& version)
 {
     Q_UNUSED(version);
     QString targetName = target;
@@ -67,7 +67,9 @@ static QString targetName( BuildType buildMode, const QString& target, const QSt
         break;
     case Dll: // dll
         targetName.prepend("lib");
-        targetName.append("." + version + ".dylib");
+        if (!version.isEmpty())
+            targetName.append('.' + version);
+        targetName.append(".dylib");
         break;
     case Lib: // lib
         targetName.prepend("lib");
@@ -255,7 +257,8 @@ bool TestCompiler::qmakeProject( const QString &workDir, const QString &proName
     return runCommand(qmakeCmd_, QStringList() << "-project" << "-o" << projectFile << "DESTDIR=./");
 }
 
-bool TestCompiler::qmake( const QString &workDir, const QString &proName, const QString &buildDir )
+bool TestCompiler::qmake(const QString &workDir, const QString &proName, const QString &buildDir,
+                         const QStringList &additionalArguments)
 {
     QDir D;
     D.setCurrent( workDir );
@@ -272,7 +275,8 @@ bool TestCompiler::qmake( const QString &workDir, const QString &proName, const
     makeFile += "Makefile";
 
     // Now start qmake and generate the makefile
-    return runCommand(qmakeCmd_, QStringList(qmakeArgs_) << projectFile << "-o" << makeFile);
+    return runCommand(qmakeCmd_, QStringList(qmakeArgs_) << projectFile << "-o" << makeFile
+                      << additionalArguments);
 }
 
 bool TestCompiler::make( const QString &workPath, const QString &target, bool expectFail )
diff --git a/tests/auto/tools/qmake/testcompiler.h b/tests/auto/tools/qmake/testcompiler.h
index a46c9b6b6a..50232669c0 100644
--- a/tests/auto/tools/qmake/testcompiler.h
+++ b/tests/auto/tools/qmake/testcompiler.h
@@ -49,6 +49,8 @@ public:
     void resetEnvironment();
     void addToEnvironment( QString varAssignment );
 
+    static QString targetName(BuildType buildMode, const QString& target, const QString& version);
+
     // executes a make clean in the specified workPath
     bool makeClean( const QString &workPath );
     // executes a make dist clean in the specified workPath
@@ -56,11 +58,13 @@ public:
     // executes a qmake -project on the specified workDir
     bool qmakeProject( const QString &workDir, const QString &proName );
     // executes a qmake on proName in the specified workDir, output goes to buildDir or workDir if it's null
-    bool qmake( const QString &workDir, const QString &proName, const QString &buildDir = QString() );
+    bool qmake(const QString &workDir, const QString &proName, const QString &buildDir = QString(),
+               const QStringList &additionalArguments = QStringList());
     // executes a make in the specified workPath, with an optional target (eg. install)
     bool make( const QString &workPath, const QString &target = QString(), bool expectFail = false );
     // checks if the executable exists in destDir
-    bool exists( const QString &destDir, const QString &exeName, BuildType buildType, const QString &version );
+    bool exists(const QString &destDir, const QString &exeName, BuildType buildType,
+                const QString &version = QString());
     // removes the makefile
     bool removeMakefile( const QString &workPath );
     // removes the project file specified by 'project' on the 'workPath'
diff --git a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro
index 0e78a91f46..f089ac14fc 100644
--- a/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro
+++ b/tests/auto/tools/qmake/testdata/simple_app/simple_app.pro
@@ -5,3 +5,8 @@ SOURCES		= test_file.cpp \
 RESOURCES = test.qrc
 TARGET	= "simple app"
 DESTDIR	= "dest dir"
+
+target.path = $$OUT_PWD/dist
+INSTALLS += target
+
+!build_pass:msvc:CONFIG(debug, debug|release):message("check for pdb, please")
diff --git a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro
index 4e362bb918..d13f49bb89 100644
--- a/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro
+++ b/tests/auto/tools/qmake/testdata/subdirs/simple_dll/simple_dll.pro
@@ -6,7 +6,6 @@ DEFINES	+= SIMPLEDLL_MAKEDLL
 HEADERS	= simple.h
 SOURCES	= simple.cpp
 
-VERSION     = 1.0.0
 INCLUDEPATH += . tmp
 MOC_DIR	= tmp
 OBJECTS_DIR = tmp
diff --git a/tests/auto/tools/qmake/tst_qmake.cpp b/tests/auto/tools/qmake/tst_qmake.cpp
index 10aabcf196..cacee30c86 100644
--- a/tests/auto/tools/qmake/tst_qmake.cpp
+++ b/tests/auto/tools/qmake/tst_qmake.cpp
@@ -30,9 +30,11 @@
 
 #include "testcompiler.h"
 
+#include <QDir>
+#include <QDirIterator>
 #include <QObject>
 #include <QStandardPaths>
-#include <QDir>
+#include <QTemporaryDir>
 
 #if defined(DEBUG_BUILD)
 #  define DIR_INFIX "debug/"
@@ -46,12 +48,17 @@ class tst_qmake : public QObject
 {
     Q_OBJECT
 
+public:
+    tst_qmake();
+
 private slots:
     void initTestCase();
+    void cleanupTestCase();
     void cleanup();
     void simple_app();
     void simple_app_shadowbuild();
     void simple_app_shadowbuild2();
+    void simple_app_versioned();
     void simple_lib();
     void simple_dll();
     void subdirs();
@@ -78,11 +85,41 @@ private slots:
 
 private:
     TestCompiler test_compiler;
+    QTemporaryDir tempWorkDir;
     QString base_path;
+    const QString origCurrentDirPath;
 };
 
+tst_qmake::tst_qmake()
+    : tempWorkDir(QDir::tempPath() + "/tst_qmake"),
+      origCurrentDirPath(QDir::currentPath())
+{
+}
+
+static void copyDir(const QString &sourceDirPath, const QString &targetDirPath)
+{
+    QDir currentDir;
+    QDirIterator dit(sourceDirPath, QDir::Dirs | QDir::NoDotAndDotDot | QDir::Hidden);
+    while (dit.hasNext()) {
+        dit.next();
+        const QString targetPath = targetDirPath + QLatin1Char('/') + dit.fileName();
+        currentDir.mkpath(targetPath);
+        copyDir(dit.filePath(), targetPath);
+    }
+
+    QDirIterator fit(sourceDirPath, QDir::Files | QDir::Hidden);
+    while (fit.hasNext()) {
+        fit.next();
+        const QString targetPath = targetDirPath + QLatin1Char('/') + fit.fileName();
+        QFile::remove(targetPath);  // allowed to fail
+        QFile src(fit.filePath());
+        QVERIFY2(src.copy(targetPath), qPrintable(src.errorString()));
+    }
+}
+
 void tst_qmake::initTestCase()
 {
+    QVERIFY2(tempWorkDir.isValid(), qPrintable(tempWorkDir.errorString()));
     QString binpath = QLibraryInfo::location(QLibraryInfo::BinariesPath);
     QString cmd = QString("%1/qmake").arg(binpath);
 #ifdef Q_CC_MSVC
@@ -99,13 +136,31 @@ void tst_qmake::initTestCase()
 #else
     test_compiler.setBaseCommands( "make", cmd );
 #endif
-    //Detect the location of the testdata
-    QString subProgram  = QLatin1String("testdata/simple_app/main.cpp");
-    base_path = QFINDTESTDATA(subProgram);
-    if (base_path.lastIndexOf(subProgram) > 0)
-        base_path = base_path.left(base_path.lastIndexOf(subProgram));
-    else
-        base_path = QCoreApplication::applicationDirPath();
+    const QString testDataSubDir = QStringLiteral("testdata");
+    const QString subProgram = testDataSubDir + QLatin1String("/simple_app/main.cpp");
+    QString testDataPath = QFINDTESTDATA(subProgram);
+    if (!testDataPath.endsWith(subProgram))
+        QFAIL("Cannot find test data directory.");
+    testDataPath.chop(subProgram.length() - testDataSubDir.length());
+
+    QString userWorkDir = qgetenv("TST_QMAKE_BUILD_DIR");
+    if (userWorkDir.isEmpty()) {
+        base_path = tempWorkDir.path();
+    } else {
+        if (!QFile::exists(userWorkDir)) {
+            QFAIL(qUtf8Printable(QStringLiteral("TST_QMAKE_BUILD_DIR %1 does not exist.")
+                                 .arg(userWorkDir)));
+        }
+        base_path = userWorkDir;
+    }
+
+    copyDir(testDataPath, base_path + QLatin1Char('/') + testDataSubDir);
+}
+
+void tst_qmake::cleanupTestCase()
+{
+    // On Windows, ~QTemporaryDir fails to remove the directory if we're still in there.
+    QDir::setCurrent(origCurrentDirPath);
 }
 
 void tst_qmake::cleanup()
@@ -119,10 +174,15 @@ void tst_qmake::simple_app()
 {
     QString workDir = base_path + "/testdata/simple_app";
     QString destDir = workDir + "/dest dir";
+    QString installDir = workDir + "/dist";
 
-    QVERIFY( test_compiler.qmake( workDir, "simple_app" ));
+    QVERIFY( test_compiler.qmake( workDir, "simple_app", QString() ));
     QVERIFY( test_compiler.make( workDir ));
     QVERIFY( test_compiler.exists( destDir, "simple app", Exe, "1.0.0" ));
+
+    QVERIFY(test_compiler.make(workDir, "install"));
+    QVERIFY(test_compiler.exists(installDir, "simple app", Exe, "1.0.0"));
+
     QVERIFY( test_compiler.makeClean( workDir ));
     QVERIFY( test_compiler.exists( destDir, "simple app", Exe, "1.0.0" )); // Should still exist after a make clean
     QVERIFY( test_compiler.makeDistClean( workDir ));
@@ -162,6 +222,40 @@ void tst_qmake::simple_app_shadowbuild2()
     QVERIFY( test_compiler.removeMakefile( buildDir ) );
 }
 
+void tst_qmake::simple_app_versioned()
+{
+    QString workDir = base_path + "/testdata/simple_app";
+    QString buildDir = base_path + "/testdata/simple_app_versioned_build";
+    QString destDir = buildDir + "/dest dir";
+    QString installDir = buildDir + "/dist";
+
+    QString version = "4.5.6";
+    QVERIFY(test_compiler.qmake(workDir, "simple_app", buildDir, QStringList{ "VERSION=" + version }));
+    QString qmakeOutput = test_compiler.commandOutput();
+    QVERIFY(test_compiler.make(buildDir));
+    QVERIFY(test_compiler.exists(destDir, "simple app", Exe, version));
+
+    QString pdbFilePath;
+    bool checkPdb = qmakeOutput.contains("Project MESSAGE: check for pdb, please");
+    if (checkPdb) {
+        QString targetBase = QFileInfo(TestCompiler::targetName(Exe, "simple app", version))
+                .completeBaseName();
+        pdbFilePath = destDir + '/' + targetBase + ".pdb";
+        QVERIFY2(QFile::exists(pdbFilePath), qPrintable(pdbFilePath));
+        QVERIFY(test_compiler.make(buildDir, "install"));
+        QString installedPdbFilePath = installDir + '/' + targetBase + ".pdb";
+        QVERIFY2(QFile::exists(installedPdbFilePath), qPrintable(installedPdbFilePath));
+    }
+
+    QVERIFY(test_compiler.makeClean(buildDir));
+    QVERIFY(test_compiler.exists(destDir, "simple app", Exe, version));
+    QVERIFY(test_compiler.makeDistClean(buildDir));
+    QVERIFY(!test_compiler.exists(destDir, "simple app", Exe, version));
+    if (checkPdb)
+        QVERIFY(!QFile::exists(pdbFilePath));
+    QVERIFY(test_compiler.removeMakefile(buildDir));
+}
+
 void tst_qmake::simple_dll()
 {
     QString workDir = base_path + "/testdata/simple_dll";
@@ -205,12 +299,12 @@ void tst_qmake::subdirs()
     D.remove( workDir + "/simple_dll/Makefile");
     QVERIFY( test_compiler.qmake( workDir, "subdirs" ));
     QVERIFY( test_compiler.make( workDir ));
-    QVERIFY( test_compiler.exists( workDir + "/simple_app/dest dir", "simple app", Exe, "1.0.0" ));
-    QVERIFY( test_compiler.exists( workDir + "/simple_dll/dest dir", "simple dll", Dll, "1.0.0" ));
+    QVERIFY( test_compiler.exists(workDir + "/simple_app/dest dir", "simple app", Exe));
+    QVERIFY( test_compiler.exists(workDir + "/simple_dll/dest dir", "simple dll", Dll));
     QVERIFY( test_compiler.makeClean( workDir ));
     // Should still exist after a make clean
-    QVERIFY( test_compiler.exists( workDir + "/simple_app/dest dir", "simple app", Exe, "1.0.0" ));
-    QVERIFY( test_compiler.exists( workDir + "/simple_dll/dest dir", "simple dll", Dll, "1.0.0" ));
+    QVERIFY( test_compiler.exists(workDir + "/simple_app/dest dir", "simple app", Exe));
+    QVERIFY( test_compiler.exists(workDir + "/simple_dll/dest dir", "simple dll", Dll));
     // Since subdirs templates do not have a make dist clean, we should clean up ourselves
     // properly
     QVERIFY( test_compiler.makeDistClean( workDir ));
@@ -500,8 +594,8 @@ void tst_qmake::resources()
     QVERIFY(test_compiler.qmake(workDir, "resources"));
 
     {
-        QFile qrcFile(workDir + "/.rcc/" DIR_INFIX "qmake_pro_file.qrc");
-        QVERIFY(qrcFile.exists());
+        QFile qrcFile(workDir + '/' + DIR_INFIX "qmake_pro_file.qrc");
+        QVERIFY2(qrcFile.exists(), qPrintable(qrcFile.fileName()));
         QVERIFY(qrcFile.open(QFile::ReadOnly));
         QByteArray qrcXml = qrcFile.readAll();
         QVERIFY(qrcXml.contains("alias=\"resources.pro\""));
@@ -509,7 +603,7 @@ void tst_qmake::resources()
     }
 
     {
-        QFile qrcFile(workDir + "/.rcc/" DIR_INFIX "qmake_subdir.qrc");
+        QFile qrcFile(workDir + '/' + DIR_INFIX "qmake_subdir.qrc");
         QVERIFY(qrcFile.exists());
         QVERIFY(qrcFile.open(QFile::ReadOnly));
         QByteArray qrcXml = qrcFile.readAll();
@@ -517,7 +611,7 @@ void tst_qmake::resources()
     }
 
     {
-        QFile qrcFile(workDir + "/.rcc/" DIR_INFIX "qmake_qmake_immediate.qrc");
+        QFile qrcFile(workDir + '/' + DIR_INFIX "qmake_qmake_immediate.qrc");
         QVERIFY(qrcFile.exists());
         QVERIFY(qrcFile.open(QFile::ReadOnly));
         QByteArray qrcXml = qrcFile.readAll();
diff --git a/tests/auto/widgets/graphicsview/qgraphicsitem/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicsitem/BLACKLIST
new file mode 100644
index 0000000000..e760042def
--- /dev/null
+++ b/tests/auto/widgets/graphicsview/qgraphicsitem/BLACKLIST
@@ -0,0 +1,3 @@
+# QTBUG-74760
+[sorting]
+opensuse-42.3
diff --git a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
index 55139ff99a..28df3a3c38 100644
--- a/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
+++ b/tests/auto/widgets/graphicsview/qgraphicsview/tst_qgraphicsview.cpp
@@ -4075,6 +4075,8 @@ void tst_QGraphicsView::update()
         QTRY_COMPARE(view.lastUpdateRegions.at(0), QRegion(updateRect) & viewportRect);
     }
     QTRY_VERIFY(!viewPrivate->fullUpdatePending);
+#else
+    Q_UNUSED(updateRect);
 #endif
 }
 
diff --git a/tests/auto/widgets/kernel/qwidget/BLACKLIST b/tests/auto/widgets/kernel/qwidget/BLACKLIST
index 1f68308bbe..3287d67875 100644
--- a/tests/auto/widgets/kernel/qwidget/BLACKLIST
+++ b/tests/auto/widgets/kernel/qwidget/BLACKLIST
@@ -10,6 +10,7 @@ osx
 ubuntu-16.04
 ubuntu-18.04
 rhel-7.4
+rhel-7.6
 osx
 [focusProxyAndInputMethods]
 linux
diff --git a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
index b1610c297d..b101f47bcd 100644
--- a/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
+++ b/tests/auto/widgets/widgets/qdoublespinbox/tst_qdoublespinbox.cpp
@@ -326,14 +326,26 @@ void tst_QDoubleSpinBox::setPrefixSuffix()
 
     QDoubleSpinBox spin(0);
     spin.setDecimals(decimals);
+    const QSize size1 = spin.sizeHint();
     spin.setPrefix(prefix);
+    const QSize size2 = spin.sizeHint();
     spin.setSuffix(suffix);
+    const QSize size3 = spin.sizeHint();
     spin.setValue(value);
     if (show)
         spin.show();
 
     QCOMPARE(spin.text(), expectedText);
     QCOMPARE(spin.cleanText(), expectedCleanText);
+
+    if (!prefix.isEmpty() && !suffix.isEmpty()) {
+        QVERIFY(size1.width() < size2.width());
+        QVERIFY(size2.width() < size3.width());
+        spin.setSuffix(QString());
+        QCOMPARE(spin.sizeHint(), size2);
+        spin.setPrefix(QString());
+        QCOMPARE(spin.sizeHint(), size1);
+    }
 }
 
 void tst_QDoubleSpinBox::valueChangedHelper(const QString &text)
diff --git a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
index 1acf07301c..ea96322654 100644
--- a/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
+++ b/tests/auto/widgets/widgets/qmainwindow/tst_qmainwindow.cpp
@@ -1343,8 +1343,10 @@ void tst_QMainWindow::restoreState()
 {
     QMainWindow mw;
     QToolBar tb(&mw);
+    tb.setObjectName(QLatin1String("toolBar"));
     mw.addToolBar(Qt::TopToolBarArea, &tb);
     QDockWidget dw(&mw);
+    dw.setObjectName(QLatin1String("dock"));
     mw.addDockWidget(Qt::LeftDockWidgetArea, &dw);
 
     QByteArray state;
diff --git a/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp b/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp
index 4cc1810cd4..f4b91265a4 100644
--- a/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp
+++ b/tests/auto/widgets/widgets/qsizegrip/tst_qsizegrip.cpp
@@ -59,25 +59,22 @@ class tst_QSizeGrip : public QObject
 {
     Q_OBJECT
 public slots:
-    void initTestCase();
-    void cleanupTestCase();
+    void cleanup();
 
 private slots:
     void hideAndShowOnWindowStateChange_data();
     void hideAndShowOnWindowStateChange();
     void orientation();
     void dontCrashOnTLWChange();
-
-private:
-    QLineEdit *dummyWidget;
 };
 
 class TestWidget : public QWidget
 {
 public:
-    TestWidget(QWidget *parent = 0, Qt::WindowFlags flags = 0) : QWidget(parent, flags) {}
-    QSize sizeHint() const { return QSize(300, 200); }
-    void changeEvent(QEvent *event)
+    using QWidget::QWidget;
+
+    QSize sizeHint() const override { return QSize(300, 200); }
+    void changeEvent(QEvent *event) override
     {
         QWidget::changeEvent(event);
         if (isWindow() && event->type() == QEvent::WindowStateChange)
@@ -85,16 +82,9 @@ public:
     }
 };
 
-void tst_QSizeGrip::initTestCase()
-{
-    dummyWidget = new QLineEdit;
-    dummyWidget->show();
-}
-
-void tst_QSizeGrip::cleanupTestCase()
+void tst_QSizeGrip::cleanup()
 {
-    delete dummyWidget;
-    dummyWidget = 0;
+    QVERIFY(QApplication::topLevelWidgets().isEmpty());
 }
 
 void tst_QSizeGrip::hideAndShowOnWindowStateChange_data()
@@ -111,46 +101,45 @@ void tst_QSizeGrip::hideAndShowOnWindowStateChange()
     QSKIP("Broken on WinRT - QTBUG-68297");
 #endif
 
-    QWidget *parentWidget = windowType == Qt::Window ?  0 : new QWidget;
-    TestWidget *widget = new TestWidget(parentWidget, Qt::WindowFlags(windowType));
-    QSizeGrip *sizeGrip = new QSizeGrip(widget);
+    QScopedPointer<QWidget> parentWidget;
+    if (windowType != Qt::Window)
+        parentWidget.reset(new QWidget);
+    QScopedPointer<TestWidget> widget(new TestWidget(parentWidget.data(), Qt::WindowFlags(windowType)));
+    QSizeGrip *sizeGrip = new QSizeGrip(widget.data());
 
     // Normal.
     if (parentWidget)
         parentWidget->show();
     else
         widget->show();
-    QVERIFY(sizeGrip->isVisible());
+    QTRY_VERIFY(sizeGrip->isVisible());
 
     widget->showFullScreen();
-    QVERIFY(!sizeGrip->isVisible());
+    QTRY_VERIFY(!sizeGrip->isVisible());
 
     widget->showNormal();
-    QVERIFY(sizeGrip->isVisible());
+    QTRY_VERIFY(sizeGrip->isVisible());
 
     widget->showMaximized();
 #ifndef Q_OS_MAC
-    QVERIFY(!sizeGrip->isVisible());
+    QTRY_VERIFY(!sizeGrip->isVisible());
 #else
     QEXPECT_FAIL("", "QTBUG-23681", Abort);
     QVERIFY(sizeGrip->isVisible());
 #endif
 
     widget->showNormal();
-    QVERIFY(sizeGrip->isVisible());
+    QTRY_VERIFY(sizeGrip->isVisible());
 
     sizeGrip->hide();
-    QVERIFY(!sizeGrip->isVisible());
+    QTRY_VERIFY(!sizeGrip->isVisible());
 
     widget->showFullScreen();
     widget->showNormal();
-    QVERIFY(!sizeGrip->isVisible());
+    QTRY_VERIFY(!sizeGrip->isVisible());
     widget->showMaximized();
     widget->showNormal();
-    QVERIFY(!sizeGrip->isVisible());
-
-    delete widget;
-    delete parentWidget;
+    QTRY_VERIFY(!sizeGrip->isVisible());
 }
 
 void tst_QSizeGrip::orientation()
@@ -196,10 +185,10 @@ void tst_QSizeGrip::dontCrashOnTLWChange()
     QMdiArea mdiArea;
     mdiArea.show();
 
-    QMainWindow *mw = new QMainWindow();
-    QMdiSubWindow *mdi = mdiArea.addSubWindow(mw);
+    QScopedPointer<QMainWindow> mw(new QMainWindow);
+    QMdiSubWindow *mdi = mdiArea.addSubWindow(mw.data());
     mw->statusBar()->setSizeGripEnabled(true);
-    mdiArea.removeSubWindow(mw);
+    mdiArea.removeSubWindow(mw.data());
     delete mdi;
     mw->show();
 
@@ -209,7 +198,7 @@ void tst_QSizeGrip::dontCrashOnTLWChange()
     QEXPECT_FAIL("", "Broken on WinRT - QTBUG-68297", Abort);
 #endif
     QVERIFY(QTest::qWaitForWindowExposed(&mdiArea));
-    QVERIFY(QTest::qWaitForWindowExposed(mw));
+    QVERIFY(QTest::qWaitForWindowExposed(mw.data()));
 }
 
 QTEST_MAIN(tst_QSizeGrip)
diff --git a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
index 7174c274f9..b9d6888263 100644
--- a/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
+++ b/tests/auto/widgets/widgets/qspinbox/tst_qspinbox.cpp
@@ -462,8 +462,11 @@ void tst_QSpinBox::setPrefixSuffix()
     QFETCH(bool, show);
 
     QSpinBox spin(0);
+    const QSize size1 = spin.sizeHint();
     spin.setPrefix(prefix);
+    const QSize size2 = spin.sizeHint();
     spin.setSuffix(suffix);
+    const QSize size3 = spin.sizeHint();
     spin.setValue(value);
     if (show)
         spin.show();
@@ -472,6 +475,15 @@ void tst_QSpinBox::setPrefixSuffix()
     QCOMPARE(spin.suffix(), suffix);
     QCOMPARE(spin.text(), expectedText);
     QCOMPARE(spin.cleanText(), expectedCleanText);
+
+    if (!prefix.isEmpty() && !suffix.isEmpty()) {
+        QVERIFY(size1.width() < size2.width());
+        QVERIFY(size2.width() < size3.width());
+        spin.setSuffix(QString());
+        QCOMPARE(spin.sizeHint(), size2);
+        spin.setPrefix(QString());
+        QCOMPARE(spin.sizeHint(), size1);
+    }
 }
 
 void tst_QSpinBox::textChangedHelper(const QString &text)