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

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

Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641

1 files changed, 33 insertions, 1 deletions

diff --git a/examples/quick/keyinteraction/focus/focus.qml b/examples/quick/keyinteraction/focus/focus.qml
index e07df57697..9db9ab48bc 100644
--- a/examples/quick/keyinteraction/focus/focus.qml
+++ b/examples/quick/keyinteraction/focus/focus.qml
@@ -48,6 +48,7 @@
 **
 ****************************************************************************/
 
+import QtQml 2.1
 import QtQuick 2.1
 import "Core"
 
@@ -67,20 +68,45 @@ Rectangle {
             id: tabMenu
             y: 160; width: parent.width; height: 160
 
+            keyUpTarget: listMenu
+            keyDownTarget: gridMenu
+
             focus: true
             activeFocusOnTab: true
+
+            onActiveFocusChanged: {
+                if (activeFocus)
+                    mainView.state = "showTabViews"
+            }
         }
 
         GridMenu {
             id: gridMenu
             y: 320; width: parent.width; height: 320
             activeFocusOnTab: true
+
+            keyUpTarget: tabMenu
+            keyDownTarget: listMenu
+            keyLeftTarget: contextMenu
+
+            onActiveFocusChanged: {
+                if (activeFocus)
+                    mainView.state = "showGridViews"
+            }
         }
 
         ListMenu {
             id: listMenu
             y: 640; width: parent.width; height: 320
             activeFocusOnTab: true
+
+            keyUpTarget: gridMenu
+            keyLeftTarget: contextMenu
+
+            onActiveFocusChanged: {
+                if (activeFocus)
+                    mainView.state = "showListViews"
+            }
         }
 
         Rectangle {
@@ -129,7 +155,13 @@ Rectangle {
         }
     }
 
-    ContextMenu { id: contextMenu; x: -265; width: 260; height: parent.height }
+    ContextMenu {
+        keyRightTarget: mainView
+        id: contextMenu
+        x: -265
+        width: 260
+        height: parent.height
+    }
 
     states: State {
         name: "contextMenuOpen"