aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorCharles Yin <charles.yin@nokia.com>2012-06-12 15:38:52 +1000
committerQt by Nokia <qt-info@nokia.com>2012-07-25 04:09:33 +0200
commit3e5d9532391549cc115f4cc6a824401acd2e8600 (patch)
tree7aae2f23dedff8471258336eb3deedf27cc7373a /src/imports
parentf22730a3390242c45fc4c8826b301606a7a7e1cb (diff)
Add waitForRendering() function for qmltest
Change-Id: I6357412d84fdb4a8b6bd8603baba7d10a2bcc245 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Diffstat (limited to 'src/imports')
-rw-r--r--src/imports/testlib/TestCase.qml6
-rw-r--r--src/imports/testlib/testcase.qdoc14
2 files changed, 18 insertions, 2 deletions
diff --git a/src/imports/testlib/TestCase.qml b/src/imports/testlib/TestCase.qml
index ddd7f7030f..79c68a75a7 100644
--- a/src/imports/testlib/TestCase.qml
+++ b/src/imports/testlib/TestCase.qml
@@ -357,6 +357,12 @@ Item {
qtest_results.wait(ms)
}
+ function waitForRendering(item, timeout) {
+ if (timeout === undefined)
+ timeout = 5000
+ return qtest_results.waitForRendering(item, timeout)
+ }
+
function sleep(ms) {
qtest_results.sleep(ms)
}
diff --git a/src/imports/testlib/testcase.qdoc b/src/imports/testlib/testcase.qdoc
index 8a0f770544..77cfae140e 100644
--- a/src/imports/testlib/testcase.qdoc
+++ b/src/imports/testlib/testcase.qdoc
@@ -474,7 +474,17 @@
Waits for \a ms milliseconds while processing Qt events.
- \sa sleep()
+ \sa sleep(), waitForRendering()
+*/
+
+/*!
+ \qmlmethod TestCase::waitForRendering(item, timeout = 5000)
+
+ Waits for \a timeout milliseconds or until the \a item is rendered by the renderer.
+ Returns true if \c item is rendered in \a timeout milliseconds, otherwise returns false.
+ The default \a timeout value is 5000.
+
+ \sa sleep(), wait()
*/
/*!
@@ -482,7 +492,7 @@
Sleeps for \a ms milliseconds without processing Qt events.
- \sa wait()
+ \sa wait(), waitForRendering()
*/
/*!