From eb93d7b51773b43e6a3e41961898a6033bcd9479 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 31 Jul 2017 14:57:02 +0200 Subject: Testlib: Format QVector2/3/4D in QCOMPARE Change-Id: Ia0709e598d2fddd6c2f448633b484749146265f7 Reviewed-by: Edward Welbourne --- src/testlib/qtest_gui.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'src/testlib') diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h index d0d56e7bd0..d848f08d55 100644 --- a/src/testlib/qtest_gui.h +++ b/src/testlib/qtest_gui.h @@ -59,6 +59,9 @@ #include #include #include +#include +#include +#include #ifdef QT_WIDGETS_LIB #include @@ -116,6 +119,32 @@ template<> inline char *toString(const QRegion ®ion) return qstrdup(result.constData()); } +#ifndef QT_NO_VECTOR2D +template<> inline char *toString(const QVector2D &v) +{ + QByteArray result = "QVector2D(" + QByteArray::number(v.x()) + ", " + + QByteArray::number(v.y()) + ')'; + return qstrdup(result.constData()); +} +#endif // !QT_NO_VECTOR2D +#ifndef QT_NO_VECTOR3D +template<> inline char *toString(const QVector3D &v) +{ + QByteArray result = "QVector3D(" + QByteArray::number(v.x()) + ", " + + QByteArray::number(v.y()) + ", " + QByteArray::number(v.z()) + ')'; + return qstrdup(result.constData()); +} +#endif // !QT_NO_VECTOR3D +#ifndef QT_NO_VECTOR4D +template<> inline char *toString(const QVector4D &v) +{ + QByteArray result = "QVector4D(" + QByteArray::number(v.x()) + ", " + + QByteArray::number(v.y()) + ", " + QByteArray::number(v.z()) + + ", " + QByteArray::number(v.w()) + ')'; + return qstrdup(result.constData()); +} +#endif // !QT_NO_VECTOR4D + inline bool qCompare(QIcon const &t1, QIcon const &t2, const char *actual, const char *expected, const char *file, int line) { -- cgit v1.2.3