diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-01-26 08:35:40 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-01-26 08:35:40 +0100 |
| commit | 980567b3a32b2e2f00c86f2d627cd82b5230dd0f (patch) | |
| tree | bc8cc4005b2e07cbc5cad8ba30f8c9fa4f236c3d /src/testlib/qtestcase.cpp | |
| parent | e81acde7d0cf5fb44a3fb2cf0bf7aaa2c65f807e (diff) | |
| parent | 730cbad8824bcfcb7ab60371a6563cfb6dd5658d (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
src/android/templates/AndroidManifest.xml
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
Change-Id: I4c9679e3a8ebba118fbf4772301ff8fde60455b9
Diffstat (limited to 'src/testlib/qtestcase.cpp')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 15e123bdb7..4263f9f049 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -2426,7 +2426,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. @@ -2437,7 +2437,7 @@ bool QTest::currentTestFailed() Example: \snippet code/src_qtestlib_qtestcase.cpp 23 - \sa qWait() + \sa {QTest::qWait()} */ void QTest::qSleep(int ms) { |