Canvas: do not emit paint signal when invisible

Task-number: QTBUG-31830
Change-Id: I23c6fc822547120f14c2d9a09f01a8f985745e2a
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>

1 files changed, 12 insertions, 3 deletions

diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml b/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml
index f13039ad95..b92f6354a5 100644
--- a/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/tst_canvas.qml
@@ -180,11 +180,20 @@ CanvasTestCase {
        tryCompare(c, "availableChangedCount", 1);
        //scene graph could be available immediately
        //in this case, we force waiting a short while until the init paint finished
-       tryCompare(c, "paintedCount", 1);
+       if (c.visible) {
+           tryCompare(c, "paintedCount", 1);
+       } else {
+           tryCompare(c, "paintedCount", 0);
+       }
        ctx.fillRect(0, 0, c.width, c.height);
        c.toDataURL();
-       tryCompare(c, "paintedCount", 2);
-       tryCompare(c, "paintCount", 1);
+       if (c.visible) {
+           tryCompare(c, "paintCount", 1);
+           tryCompare(c, "paintedCount", 2);
+       } else {
+           tryCompare(c, "paintCount", 0);
+           tryCompare(c, "paintedCount", 1);
+       }
        c.destroy();
   }
    function test_loadImage(row) {