Update Lancelot Shape tests for latest API changes

Change-Id: I6e58e0a73dac87438d16ceb27814f677bc45eb29
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

12 files changed, 399 insertions, 441 deletions

diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc.qml
deleted file mode 100644
index fd035715e0..0000000000
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc.qml
+++ /dev/null
@@ -1,120 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Shapes 1.0
-
-Item {
-    width: 320
-    height: 480
-
-    Column {
-        Item {
-            width: 200
-            height: 100
-
-            Repeater {
-                model: 2
-                PathItem {
-                    anchors.fill: parent
-                    enableVendorExtensions: false
-
-                    VisualPath {
-                        fillColor: "transparent"
-                        strokeColor: model.index === 0 ? "red" : "blue"
-                        strokeStyle: VisualPath.DashLine
-                        strokeWidth: 4
-
-                        Path {
-                            startX: 4; startY: 4
-                            PathArc {
-                                id: arc
-                                x: 96; y: 96
-                                radiusX: 100; radiusY: 100
-                                direction: model.index === 0 ? PathArc.Clockwise : PathArc.Counterclockwise
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Item {
-            width: 200
-            height: 100
-
-            Repeater {
-                model: 2
-                PathItem {
-                    anchors.fill: parent
-                    enableVendorExtensions: false
-
-                    VisualPath {
-                        fillColor: "transparent"
-                        strokeColor: model.index === 0 ? "red" : "blue"
-                        strokeStyle: VisualPath.DashLine
-                        strokeWidth: 4
-
-                        Path {
-                            startX: 50; startY: 100
-                            PathArc {
-                                x: 100; y: 150
-                                radiusX: 50; radiusY: 50
-                                useLargeArc: model.index === 1
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Item {
-            width: 200
-            height: 100
-
-            Repeater {
-                model: 2
-                PathItem {
-                    anchors.fill: parent
-                    enableVendorExtensions: false
-
-                    VisualPath {
-                        fillColor: "transparent"
-                        strokeColor: model.index === 0 ? "red" : "blue"
-                        strokeStyle: VisualPath.DashLine
-                        strokeWidth: 4
-
-                        Path {
-                            startX: 50; startY: 150
-                            PathArc {
-                                x: 150; y: 150
-                                radiusX: 50; radiusY: 20
-                                xAxisRotation: model.index === 0 ? 0 : 45
-                            }
-                        }
-                    }
-                }
-            }
-
-            Repeater {
-                model: 2
-                PathItem {
-                    anchors.fill: parent
-                    enableVendorExtensions: false
-
-                    VisualPath {
-                        fillColor: "transparent"
-                        strokeColor: model.index === 0 ? "red" : "blue"
-
-                        Path {
-                            startX: 50; startY: 150
-                            PathArc {
-                                x: 150; y: 150
-                                radiusX: 50; radiusY: 20
-                                xAxisRotation: model.index === 0 ? 0 : 45
-                                direction: PathArc.Counterclockwise
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc_fill.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc_fill.qml
deleted file mode 100644
index 56b581bbcb..0000000000
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_arc_fill.qml
+++ /dev/null
@@ -1,120 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Shapes 1.0
-
-Item {
-    width: 320
-    height: 480
-
-    Column {
-        Item {
-            width: 200
-            height: 100
-
-            Repeater {
-                model: 2
-                PathItem {
-                    anchors.fill: parent
-                    enableVendorExtensions: false
-
-                    VisualPath {
-                        fillColor: "lightBlue"
-                        strokeColor: model.index === 0 ? "red" : "blue"
-                        strokeStyle: VisualPath.DashLine
-                        strokeWidth: 4
-
-                        Path {
-                            startX: 4; startY: 4
-                            PathArc {
-                                id: arc
-                                x: 96; y: 96
-                                radiusX: 100; radiusY: 100
-                                direction: model.index === 0 ? PathArc.Clockwise : PathArc.Counterclockwise
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Item {
-            width: 200
-            height: 100
-
-            Repeater {
-                model: 2
-                PathItem {
-                    anchors.fill: parent
-                    enableVendorExtensions: false
-
-                    VisualPath {
-                        fillColor: "green"
-                        strokeColor: model.index === 0 ? "red" : "blue"
-                        strokeStyle: VisualPath.DashLine
-                        strokeWidth: 4
-
-                        Path {
-                            startX: 50; startY: 100
-                            PathArc {
-                                x: 100; y: 150
-                                radiusX: 50; radiusY: 50
-                                useLargeArc: model.index === 1
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        Item {
-            width: 200
-            height: 100
-
-            Repeater {
-                model: 2
-                PathItem {
-                    anchors.fill: parent
-                    enableVendorExtensions: false
-
-                    VisualPath {
-                        fillColor: "gray"
-                        strokeColor: model.index === 0 ? "red" : "blue"
-                        strokeStyle: VisualPath.DashLine
-                        strokeWidth: 4
-
-                        Path {
-                            startX: 50; startY: 150
-                            PathArc {
-                                x: 150; y: 150
-                                radiusX: 50; radiusY: 20
-                                xAxisRotation: model.index === 0 ? 0 : 45
-                            }
-                        }
-                    }
-                }
-            }
-
-            Repeater {
-                model: 2
-                PathItem {
-                    anchors.fill: parent
-                    enableVendorExtensions: false
-
-                    VisualPath {
-                        fillColor: "lightGray"
-                        strokeColor: model.index === 0 ? "red" : "blue"
-
-                        Path {
-                            startX: 50; startY: 150
-                            PathArc {
-                                x: 150; y: 150
-                                radiusX: 50; radiusY: 20
-                                xAxisRotation: model.index === 0 ? 0 : 45
-                                direction: PathArc.Counterclockwise
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_linear_gradient.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_linear_gradient.qml
deleted file mode 100644
index abf12c0378..0000000000
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_linear_gradient.qml
+++ /dev/null
@@ -1,35 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Shapes 1.0
-
-Item {
-    width: 320
-    height: 480
-
-    PathItem {
-        enableVendorExtensions: false
-
-        anchors.fill: parent
-
-        VisualPath {
-            strokeWidth: 4
-            strokeColor: "red"
-            fillGradient: PathLinearGradient {
-                x1: 20; y1: 20
-                x2: 180; y2: 130
-                PathGradientStop { position: 0; color: "blue" }
-                PathGradientStop { position: 0.2; color: "green" }
-                PathGradientStop { position: 0.4; color: "red" }
-                PathGradientStop { position: 0.6; color: "yellow" }
-                PathGradientStop { position: 1; color: "cyan" }
-            }
-            strokeStyle: VisualPath.DashLine
-            dashPattern: [ 1, 4 ]
-            Path {
-                startX: 20; startY: 20
-                PathLine { x: 180; y: 130 }
-                PathLine { x: 20; y: 130 }
-                PathLine { x: 20; y: 20 }
-            }
-        }
-    }
-}
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_lines.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_lines.qml
deleted file mode 100644
index b42cf7abef..0000000000
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_lines.qml
+++ /dev/null
@@ -1,110 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Shapes 1.0
-
-Item {
-    width: 320
-    height: 480
-
-    PathItem {
-        enableVendorExtensions: false
-
-        anchors.fill: parent
-
-        VisualPath {
-            strokeWidth: 1
-            strokeColor: "red"
-            fillColor: "transparent"
-            Path {
-                PathLine { x: 50; y: 50 }
-            }
-        }
-        VisualPath {
-            strokeWidth: 2
-            strokeColor: "blue"
-            fillColor: "transparent"
-            Path {
-                startX: 20
-                PathLine { x: 70; y: 50 }
-            }
-        }
-        VisualPath {
-            strokeWidth: 3
-            strokeColor: "green"
-            fillColor: "transparent"
-            Path {
-                startX: 40
-                PathLine { x: 90; y: 50 }
-            }
-        }
-        VisualPath {
-            strokeWidth: 4
-            strokeColor: "yellow"
-            fillColor: "transparent"
-            Path {
-                startX: 60
-                PathLine { x: 110; y: 50 }
-            }
-        }
-        VisualPath {
-            strokeWidth: 5
-            strokeColor: "black"
-            fillColor: "transparent"
-            strokeStyle: VisualPath.DashLine
-            Path {
-                startX: 80
-                PathLine { x: 130; y: 50 }
-            }
-        }
-
-        VisualPath {
-            strokeWidth: 20
-            strokeColor: "gray"
-            fillColor: "transparent"
-            capStyle: VisualPath.RoundCap
-            Path {
-                startX: 120; startY: 20
-                PathLine { x: 200; y: 100 }
-            }
-        }
-
-        VisualPath {
-            strokeColor: "black"
-            strokeWidth: 16
-            fillColor: "transparent"
-            capStyle: VisualPath.RoundCap
-            joinStyle: VisualPath.BevelJoin
-            Path {
-                startX: 20
-                startY: 100
-                PathLine { x: 120; y: 200 }
-                PathLine { x: 50; y: 200 }
-            }
-        }
-        VisualPath {
-            strokeColor: "black"
-            strokeWidth: 16
-            fillColor: "transparent"
-            capStyle: VisualPath.RoundCap
-            joinStyle: VisualPath.MiterJoin
-            Path {
-                startX: 150
-                startY: 100
-                PathLine { x: 250; y: 200 }
-                PathLine { x: 180; y: 200 }
-            }
-        }
-        VisualPath {
-            strokeColor: "black"
-            strokeWidth: 16
-            fillColor: "transparent"
-            capStyle: VisualPath.RoundCap
-            joinStyle: VisualPath.RoundJoin
-            Path {
-                startX: 270
-                startY: 100
-                PathLine { x: 310; y: 200 }
-                PathLine { x: 280; y: 200 }
-            }
-        }
-    }
-}
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_spread.qml b/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_spread.qml
deleted file mode 100644
index 9ba3ebdfad..0000000000
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_spread.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-import QtQuick 2.9
-import QtQuick.Shapes 1.0
-
-Item {
-    width: 320
-    height: 480
-
-    Column {
-        Repeater {
-            model: 3
-            PathItem {
-                enableVendorExtensions: false
-                width: 200
-                height: 150
-                VisualPath {
-                    strokeColor: "transparent"
-
-                    fillGradient: PathLinearGradient {
-                        id: grad
-                        y1: 50; y2: 80
-                        spread: model.index === 0 ? PathGradient.PadSpread : (model.index === 1 ? PathGradient.RepeatSpread : PathGradient.ReflectSpread)
-                        PathGradientStop { position: 0; color: "black" }
-                        PathGradientStop { position: 1; color: "red" }
-                    }
-
-                    Path {
-                        startX: 10; startY: 10
-                        PathLine { relativeX: 180; relativeY: 0 }
-                        PathLine { relativeX: 0; relativeY: 100 }
-                        PathLine { relativeX: -180; relativeY: 0 }
-                        PathLine { relativeX: 0; relativeY: -100 }
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/tests/manual/scenegraph_lancelot/data/shape/shape_arc.qml b/tests/manual/scenegraph_lancelot/data/shape/shape_arc.qml
new file mode 100644
index 0000000000..0b2396012e
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/shape/shape_arc.qml
@@ -0,0 +1,112 @@
+import QtQuick 2.9
+import QtQuick.Shapes 1.0
+
+Item {
+    width: 320
+    height: 480
+
+    Column {
+        Item {
+            width: 200
+            height: 100
+
+            Repeater {
+                model: 2
+                Shape {
+                    anchors.fill: parent
+                    vendorExtensionsEnabled: false
+
+                    ShapePath {
+                        fillColor: "transparent"
+                        strokeColor: model.index === 0 ? "red" : "blue"
+                        strokeStyle: ShapePath.DashLine
+                        strokeWidth: 4
+
+                        startX: 4; startY: 4
+                        PathArc {
+                            id: arc
+                            x: 96; y: 96
+                            radiusX: 100; radiusY: 100
+                            direction: model.index === 0 ? PathArc.Clockwise : PathArc.Counterclockwise
+                        }
+                    }
+                }
+            }
+        }
+
+        Item {
+            width: 200
+            height: 100
+
+            Repeater {
+                model: 2
+                Shape {
+                    anchors.fill: parent
+                    vendorExtensionsEnabled: false
+
+                    ShapePath {
+                        fillColor: "transparent"
+                        strokeColor: model.index === 0 ? "red" : "blue"
+                        strokeStyle: ShapePath.DashLine
+                        strokeWidth: 4
+
+                        startX: 50; startY: 100
+                        PathArc {
+                            x: 100; y: 150
+                            radiusX: 50; radiusY: 50
+                            useLargeArc: model.index === 1
+                        }
+                    }
+                }
+            }
+        }
+
+        Item {
+            width: 200
+            height: 100
+
+            Repeater {
+                model: 2
+                Shape {
+                    anchors.fill: parent
+                    vendorExtensionsEnabled: false
+
+                    ShapePath {
+                        fillColor: "transparent"
+                        strokeColor: model.index === 0 ? "red" : "blue"
+                        strokeStyle: ShapePath.DashLine
+                        strokeWidth: 4
+
+                        startX: 50; startY: 150
+                        PathArc {
+                            x: 150; y: 150
+                            radiusX: 50; radiusY: 20
+                            xAxisRotation: model.index === 0 ? 0 : 45
+                        }
+                    }
+                }
+            }
+
+            Repeater {
+                model: 2
+                Shape {
+                    anchors.fill: parent
+                    vendorExtensionsEnabled: false
+
+                    ShapePath {
+                        fillColor: "transparent"
+                        strokeColor: model.index === 0 ? "red" : "blue"
+
+                        startX: 50; startY: 150
+                        PathArc {
+                            x: 150; y: 150
+                            radiusX: 50; radiusY: 20
+                            xAxisRotation: model.index === 0 ? 0 : 45
+                            direction: PathArc.Counterclockwise
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/tests/manual/scenegraph_lancelot/data/shape/shape_arc_fill.qml b/tests/manual/scenegraph_lancelot/data/shape/shape_arc_fill.qml
new file mode 100644
index 0000000000..fefc2ec3eb
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/shape/shape_arc_fill.qml
@@ -0,0 +1,112 @@
+import QtQuick 2.9
+import QtQuick.Shapes 1.0
+
+Item {
+    width: 320
+    height: 480
+
+    Column {
+        Item {
+            width: 200
+            height: 100
+
+            Repeater {
+                model: 2
+                Shape {
+                    anchors.fill: parent
+                    vendorExtensionsEnabled: false
+
+                    ShapePath {
+                        fillColor: "lightBlue"
+                        strokeColor: model.index === 0 ? "red" : "blue"
+                        strokeStyle: ShapePath.DashLine
+                        strokeWidth: 4
+
+                        startX: 4; startY: 4
+                        PathArc {
+                            id: arc
+                            x: 96; y: 96
+                            radiusX: 100; radiusY: 100
+                            direction: model.index === 0 ? PathArc.Clockwise : PathArc.Counterclockwise
+                        }
+                    }
+                }
+            }
+        }
+
+        Item {
+            width: 200
+            height: 100
+
+            Repeater {
+                model: 2
+                Shape {
+                    anchors.fill: parent
+                    vendorExtensionsEnabled: false
+
+                    ShapePath {
+                        fillColor: "green"
+                        strokeColor: model.index === 0 ? "red" : "blue"
+                        strokeStyle: ShapePath.DashLine
+                        strokeWidth: 4
+
+                        startX: 50; startY: 100
+                        PathArc {
+                            x: 100; y: 150
+                            radiusX: 50; radiusY: 50
+                            useLargeArc: model.index === 1
+                        }
+                    }
+                }
+            }
+        }
+
+        Item {
+            width: 200
+            height: 100
+
+            Repeater {
+                model: 2
+                Shape {
+                    anchors.fill: parent
+                    vendorExtensionsEnabled: false
+
+                    ShapePath {
+                        fillColor: "gray"
+                        strokeColor: model.index === 0 ? "red" : "blue"
+                        strokeStyle: ShapePath.DashLine
+                        strokeWidth: 4
+
+                        startX: 50; startY: 150
+                        PathArc {
+                            x: 150; y: 150
+                            radiusX: 50; radiusY: 20
+                            xAxisRotation: model.index === 0 ? 0 : 45
+                        }
+                    }
+                }
+            }
+
+            Repeater {
+                model: 2
+                Shape {
+                    anchors.fill: parent
+                    vendorExtensionsEnabled: false
+
+                    ShapePath {
+                        fillColor: "lightGray"
+                        strokeColor: model.index === 0 ? "red" : "blue"
+
+                        startX: 50; startY: 150
+                        PathArc {
+                            x: 150; y: 150
+                            radiusX: 50; radiusY: 20
+                            xAxisRotation: model.index === 0 ? 0 : 45
+                            direction: PathArc.Counterclockwise
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_cubic.qml b/tests/manual/scenegraph_lancelot/data/shape/shape_cubic.qml
index 386096e467..1d2f9fd40d 100644
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_cubic.qml
+++ b/tests/manual/scenegraph_lancelot/data/shape/shape_cubic.qml
@@ -12,22 +12,20 @@ Item {
                 width: 200
                 height: 100
 
-                PathItem {
+                Shape {
                     anchors.fill: parent
-                    enableVendorExtensions: false
+                    vendorExtensionsEnabled:  false
 
-                    VisualPath {
+                    ShapePath {
                         strokeWidth: (model.index + 2) * 2
                         strokeColor: "black"
                         fillColor: "lightBlue"
 
-                        Path {
-                            startX: 50; startY: 100
-                            PathCubic {
-                                x: 150; y: 100
-                                control1X: model.index * 10; control1Y: model.index * 5
-                                control2X: model.index * -10; control2Y: model.index * 10
-                            }
+                        startX: 50; startY: 100
+                        PathCubic {
+                            x: 150; y: 100
+                            control1X: model.index * 10; control1Y: model.index * 5
+                            control2X: model.index * -10; control2Y: model.index * 10
                         }
                     }
                 }
diff --git a/tests/manual/scenegraph_lancelot/data/shape/shape_linear_gradient.qml b/tests/manual/scenegraph_lancelot/data/shape/shape_linear_gradient.qml
new file mode 100644
index 0000000000..1caaec7781
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/shape/shape_linear_gradient.qml
@@ -0,0 +1,33 @@
+import QtQuick 2.9
+import QtQuick.Shapes 1.0
+
+Item {
+    width: 320
+    height: 480
+
+    Shape {
+        vendorExtensionsEnabled: false
+
+        anchors.fill: parent
+
+        ShapePath {
+            strokeWidth: 4
+            strokeColor: "red"
+            fillGradient: LinearGradient {
+                x1: 20; y1: 20
+                x2: 180; y2: 130
+                GradientStop { position: 0; color: "blue" }
+                GradientStop { position: 0.2; color: "green" }
+                GradientStop { position: 0.4; color: "red" }
+                GradientStop { position: 0.6; color: "yellow" }
+                GradientStop { position: 1; color: "cyan" }
+            }
+            strokeStyle: ShapePath.DashLine
+            dashPattern: [ 1, 4 ]
+            startX: 20; startY: 20
+            PathLine { x: 180; y: 130 }
+            PathLine { x: 20; y: 130 }
+            PathLine { x: 20; y: 20 }
+        }
+    }
+}
diff --git a/tests/manual/scenegraph_lancelot/data/shape/shape_lines.qml b/tests/manual/scenegraph_lancelot/data/shape/shape_lines.qml
new file mode 100644
index 0000000000..56045cb5ae
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/shape/shape_lines.qml
@@ -0,0 +1,92 @@
+import QtQuick 2.9
+import QtQuick.Shapes 1.0
+
+Item {
+    width: 320
+    height: 480
+
+    Shape {
+        vendorExtensionsEnabled: false
+
+        anchors.fill: parent
+
+        ShapePath {
+            strokeWidth: 1
+            strokeColor: "red"
+            fillColor: "transparent"
+            PathLine { x: 50; y: 50 }
+        }
+        ShapePath {
+            strokeWidth: 2
+            strokeColor: "blue"
+            fillColor: "transparent"
+            startX: 20
+            PathLine { x: 70; y: 50 }
+        }
+        ShapePath {
+            strokeWidth: 3
+            strokeColor: "green"
+            fillColor: "transparent"
+            startX: 40
+            PathLine { x: 90; y: 50 }
+        }
+        ShapePath {
+            strokeWidth: 4
+            strokeColor: "yellow"
+            fillColor: "transparent"
+            startX: 60
+            PathLine { x: 110; y: 50 }
+        }
+        ShapePath {
+            strokeWidth: 5
+            strokeColor: "black"
+            fillColor: "transparent"
+            strokeStyle: ShapePath.DashLine
+            startX: 80
+            PathLine { x: 130; y: 50 }
+        }
+
+        ShapePath {
+            strokeWidth: 20
+            strokeColor: "gray"
+            fillColor: "transparent"
+            capStyle: ShapePath.RoundCap
+            startX: 120; startY: 20
+            PathLine { x: 200; y: 100 }
+        }
+
+        ShapePath {
+            strokeColor: "black"
+            strokeWidth: 16
+            fillColor: "transparent"
+            capStyle: ShapePath.RoundCap
+            joinStyle: ShapePath.BevelJoin
+            startX: 20
+            startY: 100
+            PathLine { x: 120; y: 200 }
+            PathLine { x: 50; y: 200 }
+        }
+        ShapePath {
+            strokeColor: "black"
+            strokeWidth: 16
+            fillColor: "transparent"
+            capStyle: ShapePath.RoundCap
+            joinStyle: ShapePath.MiterJoin
+            startX: 150
+            startY: 100
+            PathLine { x: 250; y: 200 }
+            PathLine { x: 180; y: 200 }
+        }
+        ShapePath {
+            strokeColor: "black"
+            strokeWidth: 16
+            fillColor: "transparent"
+            capStyle: ShapePath.RoundCap
+            joinStyle: ShapePath.RoundJoin
+            startX: 270
+            startY: 100
+            PathLine { x: 310; y: 200 }
+            PathLine { x: 280; y: 200 }
+        }
+    }
+}
diff --git a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_quad.qml b/tests/manual/scenegraph_lancelot/data/shape/shape_quad.qml
index 3a2bdda581..a4c95f7c15 100644
--- a/tests/manual/scenegraph_lancelot/data/pathitem/pathitem_quad.qml
+++ b/tests/manual/scenegraph_lancelot/data/shape/shape_quad.qml
@@ -12,21 +12,19 @@ Item {
                 width: 200
                 height: 100
 
-                PathItem {
+                Shape {
                     anchors.fill: parent
-                    enableVendorExtensions: false
+                    vendorExtensionsEnabled: false
 
-                    VisualPath {
+                    ShapePath {
                         strokeWidth: (model.index + 2) * 2
                         strokeColor: "black"
                         fillColor: "lightBlue"
 
-                        Path {
-                            startX: 50; startY: 100
-                            PathQuad {
-                                x: 150; y: 100
-                                controlX: model.index * 10; controlY: model.index * 5
-                            }
+                        startX: 50; startY: 100
+                        PathQuad {
+                            x: 150; y: 100
+                            controlX: model.index * 10; controlY: model.index * 5
                         }
                     }
                 }
diff --git a/tests/manual/scenegraph_lancelot/data/shape/shape_spread.qml b/tests/manual/scenegraph_lancelot/data/shape/shape_spread.qml
new file mode 100644
index 0000000000..f310f08773
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/shape/shape_spread.qml
@@ -0,0 +1,35 @@
+import QtQuick 2.9
+import QtQuick.Shapes 1.0
+
+Item {
+    width: 320
+    height: 480
+
+    Column {
+        Repeater {
+            model: 3
+            Shape {
+                vendorExtensionsEnabled: false
+                width: 200
+                height: 150
+                ShapePath {
+                    strokeColor: "transparent"
+
+                    fillGradient: LinearGradient {
+                        id: grad
+                        y1: 50; y2: 80
+                        spread: model.index === 0 ? ShapeGradient.PadSpread : (model.index === 1 ? ShapeGradient.RepeatSpread : ShapeGradient.ReflectSpread)
+                        GradientStop { position: 0; color: "black" }
+                        GradientStop { position: 1; color: "red" }
+                    }
+
+                    startX: 10; startY: 10
+                    PathLine { relativeX: 180; relativeY: 0 }
+                    PathLine { relativeX: 0; relativeY: 100 }
+                    PathLine { relativeX: -180; relativeY: 0 }
+                    PathLine { relativeX: 0; relativeY: -100 }
+                }
+            }
+        }
+    }
+}