summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtest.h
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-08 01:00:59 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-12-08 01:01:00 +0100
commitf8c5c1356465f503e1a8357ceff01bb956d51c9e (patch)
tree36b5bc1c2d5767b3eee0820c70b91fdfc57287b3 /src/testlib/qtest.h
parenteda28621f6c1a68774719f382be53ec109123b18 (diff)
parent153726bc167406414f589f72bea76c3229cfa815 (diff)
Merge remote-tracking branch 'origin/5.12' into dev
Diffstat (limited to 'src/testlib/qtest.h')
-rw-r--r--src/testlib/qtest.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index 82078ad7a8..900050f012 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -49,6 +49,7 @@
#include <QtCore/qbytearray.h>
#include <QtCore/qstring.h>
#include <QtCore/qstringlist.h>
+#include <QtCore/qcborcommon.h>
#include <QtCore/qdatetime.h>
#include <QtCore/qobject.h>
#include <QtCore/qvariant.h>
@@ -110,6 +111,12 @@ template<> inline char *toString(const QDateTime &dateTime)
}
#endif // datestring
+template<> inline char *toString(const QCborError &c)
+{
+ // use the Q_ENUM formatting
+ return toString(c.c);
+}
+
template<> inline char *toString(const QChar &c)
{
const ushort uc = c.unicode();