1 files changed, 10 insertions, 7 deletions
diff --git a/tests/auto/qtquick2/qquickcanvasitem/data/tst_fillrect.qml b/tests/auto/qtquick2/qquickcanvasitem/data/tst_fillrect.qml
index 2061647268..08197816e9 100644
--- a/tests/auto/qtquick2/qquickcanvasitem/data/tst_fillrect.qml
+++ b/tests/auto/qtquick2/qquickcanvasitem/data/tst_fillrect.qml
@@ -2,15 +2,18 @@ import QtQuick 2.0
 import QtTest 1.0
 
 Canvas {
-   id:canvas; width:1;height:1; renderTarget:Canvas.Image
-   onPaint: {
-     context.fillStyle = "red";
-     context.fillRect(0, 0, canvas.width, canvas.height);
-   }
+   id:canvas; width:1;height:1;
+   renderTarget:Canvas.Image
+   renderStrategy: Canvas.Immediate
+
    TestCase {
-       name: "FillRect"; when: windowShown
+       name: "FillRect"; when: canvas.available
+
        function test_fillRect() {
            var ctx = canvas.getContext('2d');
+           ctx.fillStyle = "red";
+           ctx.fillRect(0, 0, canvas.width, canvas.height);
+
            var imageData = ctx.getImageData(0, 0, 1, 1);
            var d = imageData.data;
            verify(d.length == 4);
@@ -20,4 +23,4 @@ Canvas {
            verify(d[3] == 255);
       }
    }
-}
-\ No newline at end of file
+}