From e7224de627ac89a7c4701f53dc884616891a0199 Mon Sep 17 00:00:00 2001
From: Gunnar Sletta <gunnar.sletta@nokia.com>
Date: Mon, 30 Jan 2012 10:34:55 +0100
Subject: [PATCH] Stabilize tests
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: Iafaf645787dfecfbe044dd87dbfdbb884a75040b
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
---
 tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp b/tests/auto/qtquick2/qquickcanvas/tst_qquickcanvas.cpp
index 56347d0..795580c 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()
-- 
2.7.4