aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorCharles Yin <charles.yin@nokia.com>2012-06-12 14:46:12 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-14 02:44:19 +0200
commit4276def0405d22e7cbfb75465a42b5a68e7472fe (patch)
tree05877ad9a2f64eb09af4ec597a15f59072f26327 /tests
parent5eeffd021996f1bae32973681aa4db3e354aacdb (diff)
Align windowShown flag with qml renderer state
Previously, we set windowShown to true once the window is active, this is not enough for some tests as the initial rendering may not be finished yet and will give the wrong result for some tests which require reading back pixels. Change-Id: Idd67329d207aaf1734a795b40a5bcc40093cf6b8 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qmltest/pixel/tst_pixel.qml1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/auto/qmltest/pixel/tst_pixel.qml b/tests/auto/qmltest/pixel/tst_pixel.qml
index 624f084817..d36bce21ab 100644
--- a/tests/auto/qmltest/pixel/tst_pixel.qml
+++ b/tests/auto/qmltest/pixel/tst_pixel.qml
@@ -52,7 +52,6 @@ Rectangle {
when: windowShown
function test_pixel() {
- wait(200);
var img = grabImage(rect);
compare(img.pixel(20, 20), Qt.rgba(255, 0, 0, 255));
compare(img.red(1,1), 255);