2 files changed, 19 insertions, 3 deletions
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index ba63df5f36..30aadfba92 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -84,21 +84,21 @@ template<> inline char *toString(const QByteArray &ba)
 template<> inline char *toString(const QTime &time)
 {
     return time.isValid()
-        ? qstrdup(qPrintable(time.toString(QLatin1String("hh:mm:ss.zzz"))))
+        ? qstrdup(qPrintable(time.toString(QStringViewLiteral("hh:mm:ss.zzz"))))
         : qstrdup("Invalid QTime");
 }
 
 template<> inline char *toString(const QDate &date)
 {
     return date.isValid()
-        ? qstrdup(qPrintable(date.toString(QLatin1String("yyyy/MM/dd"))))
+        ? qstrdup(qPrintable(date.toString(QStringViewLiteral("yyyy/MM/dd"))))
         : qstrdup("Invalid QDate");
 }
 
 template<> inline char *toString(const QDateTime &dateTime)
 {
     return dateTime.isValid()
-        ? qstrdup(qPrintable(dateTime.toString(QLatin1String("yyyy/MM/dd hh:mm:ss.zzz[t]"))))
+        ? qstrdup(qPrintable(dateTime.toString(QStringViewLiteral("yyyy/MM/dd hh:mm:ss.zzz[t]"))))
         : qstrdup("Invalid QDateTime");
 }
 #endif // QT_NO_DATESTRING
diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index a7e825396a..8347b99f17 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -259,6 +259,22 @@ namespace QTest
         return Internal::toString(t);
     }
 
+    template <typename T1, typename T2>
+    inline char *toString(const QPair<T1, T2> &pair)
+    {
+        const QScopedArrayPointer<char> first(toString(pair.first));
+        const QScopedArrayPointer<char> second(toString(pair.second));
+        return toString(QString::asprintf("QPair(%s,%s)", first.data(), second.data()));
+    }
+
+    template <typename T1, typename T2>
+    inline char *toString(const std::pair<T1, T2> &pair)
+    {
+        const QScopedArrayPointer<char> first(toString(pair.first));
+        const QScopedArrayPointer<char> second(toString(pair.second));
+        return toString(QString::asprintf("std::pair(%s,%s)", first.data(), second.data()));
+    }
+
     Q_TESTLIB_EXPORT char *toHexRepresentation(const char *ba, int length);
     Q_TESTLIB_EXPORT char *toPrettyCString(const char *unicode, int length);
     Q_TESTLIB_EXPORT char *toPrettyUnicode(const ushort *unicode, int length);