fix several canvasitem bugs

Change-Id: I6a6d97253fe66184736f8ac089e97aa114f0e83a
Reviewed-on: http://codereview.qt-project.org/6405
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>

1 files changed, 4 insertions, 3 deletions

diff --git a/tests/auto/declarative/qsgcanvasitem/data/tst_canvas.qml b/tests/auto/declarative/qsgcanvasitem/data/tst_canvas.qml
index db61fcec80..70bedb2131 100644
--- a/tests/auto/declarative/qsgcanvasitem/data/tst_canvas.qml
+++ b/tests/auto/declarative/qsgcanvasitem/data/tst_canvas.qml
@@ -222,10 +222,11 @@ Rectangle {
            verify(c);
 
            c.renderTarget = Canvas.Image;
-
-           c.requestPaint();
-           wait(100);
+           c.renderInThread = true;
+           var ctx = c.getContext();
+           ctx.fillRect(0, 0, c.width, c.height);
            c.toDataURL();
+           wait(100);
 
            compare(c.paintedCount, 1);
            compare(c.paintCount, 1);