aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2012-01-30 10:34:55 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-01 07:02:38 +0100
commite7224de627ac89a7c4701f53dc884616891a0199 (patch)
tree4aa3a601bf1f875b2d41f53e2746144cd5c4a0ee /tests
parentb5db46864e641a86d9b8bdda8c77834fc49e558a (diff)
Stabilize tests
Change-Id: Iafaf645787dfecfbe044dd87dbfdbb884a75040b Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp b/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp
index 56347d01d1..795580cc6e 100644
--- a/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp
+++ b/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp
@@ -567,6 +567,8 @@ void tst_qquickcanvas::grab()
canvas.resize(250, 250);
canvas.show();
+ QTest::qWaitForWindowShown(&canvas);
+
QImage content = canvas.grabFrameBuffer();
QCOMPARE(content.width(), canvas.width());
QCOMPARE(content.height(), canvas.height());
@@ -667,7 +669,7 @@ void tst_qquickcanvas::headless()
QCOMPARE(originalContent, newContent);
-
+ delete canvas;
}
void tst_qquickcanvas::focusObject()