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

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

Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641

1 files changed, 4 insertions, 2 deletions

diff --git a/examples/quick/keyinteraction/focus/Core/ListViewDelegate.qml b/examples/quick/keyinteraction/focus/Core/ListViewDelegate.qml
index b1dde9ddc5..5a2957eab0 100644
--- a/examples/quick/keyinteraction/focus/Core/ListViewDelegate.qml
+++ b/examples/quick/keyinteraction/focus/Core/ListViewDelegate.qml
@@ -52,6 +52,8 @@ import QtQuick 2.1
 
 Item {
     id: container
+    required property int index
+
     width: ListView.view.width; height: 60; anchors.leftMargin: 10; anchors.rightMargin: 10
 
     Rectangle {
@@ -67,7 +69,7 @@ Item {
     Text {
         id: label
         anchors.centerIn: content
-        text: "List element " + (index + 1)
+        text: "List element " + (container.index + 1)
         color: "#193441"
         font.pixelSize: 14
     }
@@ -78,7 +80,7 @@ Item {
         hoverEnabled: true
 
         onClicked: {
-            container.ListView.view.currentIndex = index
+            container.ListView.view.currentIndex = container.index
             container.forceActiveFocus()
         }
     }