diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-17 11:02:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-17 11:02:54 +0200 |
| commit | d90b155c6034bc16a9eb2d5794f101cde4ea9e2c (patch) | |
| tree | e648b8db6b9e8e8d7f0c765ac2953b066524eb49 /src/testlib/qtestcase.qdoc | |
| parent | b00565bc2803bb783e8f2b0d02becfa73323e283 (diff) | |
| parent | d71bb504a635b51a85f3ccd919e0d77f869e50a8 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
mkspecs/macx-ios-clang/features/resolve_config.prf
src/testlib/qtestcase.qdoc
Change-Id: Icefa63056ffb37106f35299a8f19165535571799
Diffstat (limited to 'src/testlib/qtestcase.qdoc')
| -rw-r--r-- | src/testlib/qtestcase.qdoc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/testlib/qtestcase.qdoc b/src/testlib/qtestcase.qdoc index 85f71fc27f..f34c84708f 100644 --- a/src/testlib/qtestcase.qdoc +++ b/src/testlib/qtestcase.qdoc @@ -124,7 +124,7 @@ \relates QTest The QTRY_VERIFY_WITH_TIMEOUT() macro is similar to QVERIFY(), but checks the \a condition - repeatedly, until either the condition becomes true or the \a timeout is + repeatedly, until either the condition becomes true or the \a timeout (in milliseconds) is reached. Between each evaluation, events will be processed. If the timeout is reached, a failure is recorded in the test log and the test won't be executed further. @@ -156,7 +156,7 @@ The QTRY_VERIFY2_WITH_TIMEOUT macro is similar to QTRY_VERIFY_WITH_TIMEOUT() except that it outputs a verbose \a message when \a condition is still false - after the specified \a timeout. The \a message is a plain C string. + after the specified \a timeout (in milliseconds). The \a message is a plain C string. Example: \code @@ -196,7 +196,7 @@ The QTRY_COMPARE_WITH_TIMEOUT() macro is similar to QCOMPARE(), but performs the comparison of the \a actual and \a expected values repeatedly, until either the two values - are equal or the \a timeout is reached. Between each comparison, events + are equal or the \a timeout (in milliseconds) is reached. Between each comparison, events will be processed. If the timeout is reached, a failure is recorded in the test log and the test won't be executed further. |