summaryrefslogtreecommitdiffstats
path: root/src/testlib/qtestcase.qdoc
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-01-23 10:13:28 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-01-23 10:13:29 +0100
commite3da05f39a5b000bbb6194396d688bf26af771fd (patch)
tree6b1e0b84a2ef9b7abdd465c0aecb5688fcb40f1a /src/testlib/qtestcase.qdoc
parent0c007a87be88f44151616b7251cfed5508913e0f (diff)
parent9822d57d858068cfe5a07281ef069ef8c4c7b7b3 (diff)
Merge remote-tracking branch 'origin/5.12.1' into 5.12
Diffstat (limited to 'src/testlib/qtestcase.qdoc')
-rw-r--r--src/testlib/qtestcase.qdoc22
1 files changed, 22 insertions, 0 deletions
diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc
index 31903ea29c..2af016304d 100644
--- a/src/testlib/qtestcase.qdoc
+++ b/src/testlib/qtestcase.qdoc
@@ -995,6 +995,22 @@
*/
/*!
+ \fn char *QTest::toString(const QCborError &c)
+ \overload
+ \since 5.12
+
+ Returns a textual representation of the given CBOR error \a c.
+*/
+
+/*!
+ \fn template <class... Types> char *QTest::toString(const std::tuple<Types...> &tuple)
+ \overload
+ \since 5.12
+
+ Returns a textual representation of the given \a tuple.
+*/
+
+/*!
\fn char *QTest::toString(const QTime &time)
\overload
@@ -1113,6 +1129,12 @@
*/
/*!
+ \fn template <typename Tuple, int... I> char *QTest::toString(const Tuple &tuple, QtPrivate::IndexesList<I...> )
+ \internal
+ \since 5.12
+*/
+
+/*!
\fn QTouchDevice *QTest::createTouchDevice(QTouchDevice::DeviceType devType = QTouchDevice::TouchScreen)
\since 5.8