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

 Conflicts:
	dependencies.yaml
	src/qml/qml/qqmlengine.cpp

Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641

1 files changed, 7 insertions, 3 deletions

diff --git a/examples/quick/views/gridview/gridview-example.qml b/examples/quick/views/gridview/gridview-example.qml
index 76a1d8dd37..4cc30d3736 100644
--- a/examples/quick/views/gridview/gridview-example.qml
+++ b/examples/quick/views/gridview/gridview-example.qml
@@ -74,20 +74,24 @@ Rectangle {
         highlight: Rectangle { width: 80; height: 80; color: "lightsteelblue" }
 
         delegate: Item {
+            required property string icon
+            required property string name
+            required property int index
+
             width: 100; height: 100
 
             Image {
                 id: myIcon
                 y: 20; anchors.horizontalCenter: parent.horizontalCenter
-                source: icon
+                source: parent.icon
             }
             Text {
                 anchors { top: myIcon.bottom; horizontalCenter: parent.horizontalCenter }
-                text: name
+                text: parent.name
             }
             MouseArea {
                 anchors.fill: parent
-                onClicked: parent.GridView.view.currentIndex = index
+                onClicked: parent.GridView.view.currentIndex = parent.index
             }
         }
     }