Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	tests/auto/qml/qml.pro
	tools/qmlprofiler/qmlprofilerclient.cpp

Change-Id: Id47f15a5ab38f8ec79f0a26c92805acba62caac4

1 files changed, 37 insertions, 0 deletions

diff --git a/tests/auto/quick/qquickitem2/data/keynavigationtest_loop.qml b/tests/auto/quick/qquickitem2/data/keynavigationtest_loop.qml
new file mode 100644
index 0000000000..dfac1549f9
--- /dev/null
+++ b/tests/auto/quick/qquickitem2/data/keynavigationtest_loop.qml
@@ -0,0 +1,37 @@
+import QtQuick 2.0
+
+Column {
+    width: 50; height: 200
+    Rectangle {
+        id: item1
+        objectName: "item1"
+        focus: true
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.down: item2
+    }
+    Rectangle {
+        id: item2
+        objectName: "item2"
+        enabled: false
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.down: item3
+    }
+    Rectangle {
+        id: item3
+        objectName: "item3"
+        enabled: false
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.down: item4
+    }
+    Rectangle {
+        id: item4
+        objectName: "item4"
+        enabled: false
+        width: 50; height: 50
+        color: focus ? "red" : "lightgray"
+        KeyNavigation.down: item3
+    }
+}