1 files changed, 43 insertions, 0 deletions
diff --git a/tests/auto/quick/qquickcanvasitem/data/tst_line.qml b/tests/auto/quick/qquickcanvasitem/data/tst_line.qml
index dc960a24d0..e5d03e5db7 100644
--- a/tests/auto/quick/qquickcanvasitem/data/tst_line.qml
+++ b/tests/auto/quick/qquickcanvasitem/data/tst_line.qml
@@ -6,6 +6,7 @@ CanvasTestCase {
    function init_data() { return testData("2d"); }
    function test_default(row) {
        var canvas = createCanvasObject(row);
+       tryVerify(function() { return canvas.available; });
        var ctx = canvas.getContext('2d');
        ctx.reset();
        compare(ctx.lineWidth, 1);
@@ -16,6 +17,7 @@ CanvasTestCase {
 
    function test_cross(row) {
        var canvas = createCanvasObject(row);
+       tryVerify(function() { return canvas.available; });
        var ctx = canvas.getContext('2d');
        ctx.reset();
        ctx.fillStyle = '#0f0';
@@ -43,6 +45,7 @@ CanvasTestCase {
 
    function test_join(row) {
        var canvas = createCanvasObject(row);
+       tryVerify(function() { return canvas.available; });
        var ctx = canvas.getContext('2d');
        ctx.reset();
 
@@ -306,6 +309,7 @@ CanvasTestCase {
    }
    function test_miter(row) {
        var canvas = createCanvasObject(row);
+       tryVerify(function() { return canvas.available; });
        var ctx = canvas.getContext('2d');
        ctx.reset();
        ctx.fillStyle = '#f00';
@@ -481,6 +485,7 @@ CanvasTestCase {
    }
    function test_width(row) {
        var canvas = createCanvasObject(row);
+       tryVerify(function() { return canvas.available; });
        var ctx = canvas.getContext('2d');
        ctx.reset();
        ctx.fillStyle = '#0f0';
@@ -621,7 +626,11 @@ CanvasTestCase {
 
    }
    function test_cap(row) {
+       if (Qt.platform.os === "android")
+           skip("line::test_cap crashes on Android, QTBUG-103257")
+
        var canvas = createCanvasObject(row);
+       tryVerify(function() { return canvas.available; });
        var ctx = canvas.getContext('2d');
        ctx.reset();
 
@@ -838,6 +847,7 @@ CanvasTestCase {
 
    function test_lineDash(row) {
        var canvas = createCanvasObject(row);
+       tryVerify(function() { return canvas.available; });
        var ctx = canvas.getContext('2d');
        ctx.reset();
        ctx.strokeStyle = "#fff";
@@ -894,8 +904,41 @@ CanvasTestCase {
        comparePixel(ctx, 39,0, 0,0,0,0);
   }
 
+   function test_lineDashReset(row) {
+       var canvas = createCanvasObject(row);
+       tryVerify(function() { return canvas.available; });
+       var ctx = canvas.getContext('2d');
+       ctx.reset();
+       ctx.strokeStyle = "#ff0000";
+       ctx.lineWidth = 2;
+       var pattern = [2, 3, 5, 1, 6, 3]
+       ctx.setLineDash(pattern)
+
+       compare(ctx.getLineDash(), pattern);
+
+       pattern = []
+       ctx.setLineDash(pattern)
+       compare(ctx.getLineDash(), pattern);
+
+       ctx.beginPath();
+       ctx.moveTo(0, 0);
+       ctx.lineTo(40, 0);
+       ctx.stroke();
+
+       comparePixel(ctx, 0,0, 255,0,0,255);
+       comparePixel(ctx, 4,0, 255,0,0,255);
+       comparePixel(ctx, 5,0, 255,0,0,255);
+       comparePixel(ctx, 14,0, 255,0,0,255);
+       comparePixel(ctx, 20,0, 255,0,0,255);
+       comparePixel(ctx, 21,0, 255,0,0,255);
+       comparePixel(ctx, 22,0, 255,0,0,255);
+       comparePixel(ctx, 34,0, 255,0,0,255);
+       comparePixel(ctx, 35,0, 255,0,0,255);
+   }
+
    function test_lineDashOffset(row) {
        var canvas = createCanvasObject(row);
+       tryVerify(function() { return canvas.available; });
        var ctx = canvas.getContext('2d');
        ctx.reset();
        ctx.strokeStyle = "#fff";