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

Removed dependencies.yaml because we don't use it yet in wip/cmake.
Fixed conflict in qmlcachegen.cpp.

Change-Id: Ie1060c737bee1daa85779903598e5b6d5020d922

1 files changed, 47 insertions, 0 deletions

diff --git a/tests/auto/quick/qquicklistview/data/delegatesWithRequiredProperties.qml b/tests/auto/quick/qquicklistview/data/delegatesWithRequiredProperties.qml
new file mode 100644
index 0000000000..f354517678
--- /dev/null
+++ b/tests/auto/quick/qquicklistview/data/delegatesWithRequiredProperties.qml
@@ -0,0 +1,47 @@
+import QtQuick 2.12
+import Qt.fruit 1.0
+
+Rectangle {
+    id: root
+    required property bool useCpp
+    width: 200; height: 200
+
+
+    ListModel {
+        id: fruitModel
+
+        ListElement {
+            name: "Apple"
+            cost: 2
+        }
+        ListElement {
+            name: "Orange"
+            cost: 3
+        }
+        ListElement {
+            name: "Banana"
+            cost: 1
+        }
+    }
+
+
+    Component {
+        id: fruitDelegate
+        Row {
+            id: row
+            spacing: 10
+            required property string name
+            required property int cost
+            Text { text: row.name }
+            Text { text: '$' + row.cost }
+            Component.onCompleted: () => { console.debug(row.name+row.cost) };
+        }
+    }
+
+    ListView {
+        anchors.fill: parent
+        model: root.useCpp ? FruitModelCpp : fruitModel
+        delegate: fruitDelegate
+    }
+
+}