5 files changed, 96 insertions, 3 deletions
diff --git a/src/testlib/doc/qttestlib.qdocconf b/src/testlib/doc/qttestlib.qdocconf
index 1fdb136e78..93a5ab393c 100644
--- a/src/testlib/doc/qttestlib.qdocconf
+++ b/src/testlib/doc/qttestlib.qdocconf
@@ -31,8 +31,16 @@ depends                 += qtcore qtdoc qtwidgets qtgui qmake qtquick
 
 headerdirs  += ..
 
+headers     += ../../corelib/kernel/qtestsupport_core.h \
+               ../../gui/kernel/qtestsupport_gui.h \
+               ../../widgets/kernel/qtestsupport_widgets.h
+
 sourcedirs  += ..
 
+sources     += ../../corelib/kernel/qtestsupport_core.cpp \
+               ../../gui/kernel/qtestsupport_gui.cpp \
+               ../../widgets/kernel/qtestsupport_widgets.cpp
+
 exampledirs += ../../../examples/qtestlib \
                ../ \
                snippets
diff --git a/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp b/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp
new file mode 100644
index 0000000000..e793cb1f55
--- /dev/null
+++ b/src/testlib/doc/snippets/code/src_corelib_kernel_qtestsupport_core.cpp
@@ -0,0 +1,63 @@
+/****************************************************************************
+**
+** Copyright (C) 2018 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//! [0]
+    MyObject obj;
+    obj.startup();
+    QTest::qWaitFor([&]() {
+        return obj.isReady();
+    }, 3000);
+//! [0]
+
+//! [1]
+    int i = 0;
+    while (myNetworkServerNotResponding() && i++ < 50)
+        QTest::qWait(250);
+//! [1]
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index dbe7353bbe..2b0ad52b2d 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -2419,7 +2419,7 @@ bool QTest::currentTestFailed()
     Sleeps for \a ms milliseconds, blocking execution of the
     test. qSleep() will not do any event processing and leave your test
     unresponsive. Network communication might time out while
-    sleeping. Use \l qWait() to do non-blocking sleeping.
+    sleeping. Use \l {QTest::qWait()} to do non-blocking sleeping.
 
     \a ms must be greater than 0.
 
@@ -2430,7 +2430,7 @@ bool QTest::currentTestFailed()
     Example:
     \snippet code/src_qtestlib_qtestcase.cpp 23
 
-    \sa qWait()
+    \sa {QTest::qWait()}
 */
 void QTest::qSleep(int ms)
 {
diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc
index ad9776f7ec..b00c9e51cd 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
 
diff --git a/src/testlib/qtestevent.qdoc b/src/testlib/qtestevent.qdoc
index f0d3bff162..af84f2ac2b 100644
--- a/src/testlib/qtestevent.qdoc
+++ b/src/testlib/qtestevent.qdoc
@@ -133,7 +133,7 @@
 
     Adds a \a msecs milliseconds delay.
 
-    \sa QTest::qWait()
+    \sa {QTest::qWait()}
 */
 
 /*! \fn void QTestEventList::simulate(QWidget *w)