Move toString calls after their definition

Move two functions that are using toString(const QString &str) from
qtestcase.h to qtest.h. This fixes compilation on INTEGRITY platform.

Task-number: QTBUG-61702
Change-Id: I5a433126741c7a52621616c5b98203e7d642b330
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Samuel Gaist <samuel.gaist@edeltech.ch>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>

1 files changed, 2 insertions, 12 deletions

diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h
index fafc0eb7d6..b738043cb7 100644
--- a/src/testlib/qtestcase.h
+++ b/src/testlib/qtestcase.h
@@ -260,20 +260,10 @@ namespace QTest
     }
 
     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()));
-    }
+    inline char *toString(const QPair<T1, T2> &pair);
 
     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()));
-    }
+    inline char *toString(const std::pair<T1, T2> &pair);
 
     Q_TESTLIB_EXPORT char *toHexRepresentation(const char *ba, int length);
     Q_TESTLIB_EXPORT char *toPrettyCString(const char *unicode, int length);