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, 35 insertions, 0 deletions

diff --git a/tests/manual/scenegraph_lancelot/data/shape/shape_cubic.qml b/tests/manual/scenegraph_lancelot/data/shape/shape_cubic.qml
new file mode 100644
index 0000000000..1d2f9fd40d
--- /dev/null
+++ b/tests/manual/scenegraph_lancelot/data/shape/shape_cubic.qml
@@ -0,0 +1,35 @@
+import QtQuick 2.9
+import QtQuick.Shapes 1.0
+
+Item {
+    width: 320
+    height: 480
+
+    Column {
+        Repeater {
+            model: 4
+            Item {
+                width: 200
+                height: 100
+
+                Shape {
+                    anchors.fill: parent
+                    vendorExtensionsEnabled:  false
+
+                    ShapePath {
+                        strokeWidth: (model.index + 2) * 2
+                        strokeColor: "black"
+                        fillColor: "lightBlue"
+
+                        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
+                        }
+                    }
+                }
+            }
+        }
+    }
+}