Merge remote-tracking branch 'origin/dev' into wip/pointerhandler

Conflicts:
      examples/quick/shared/LauncherList.qml
      src/quick/items/qquickevents.cpp
      src/quick/items/qquickevents_p_p.h
      src/quick/items/qquickwindow.cpp
      tests/auto/quick/touchmouse/tst_touchmouse.cpp

Change-Id: Id692d291455093fc72db61f1b854f3fc9190267b

1 files changed, 112 insertions, 0 deletions

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
+                        }
+                    }
+                }
+            }
+        }
+    }
+}