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

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