Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/layouts/qquicklinearlayout.cpp

Change-Id: Ib24dab43c37fc0f3f6a85398766f102a1ac833c3

1 files changed, 6 insertions, 10 deletions

diff --git a/examples/quick/controls/touch/main.qml b/examples/quick/controls/touch/main.qml
index ab5d534f..163ec937 100644
--- a/examples/quick/controls/touch/main.qml
+++ b/examples/quick/controls/touch/main.qml
@@ -52,16 +52,6 @@ ApplicationWindow {
         anchors.fill: parent
     }
 
-    // Implements back key navigation
-    Keys.onReleased: {
-        if (event.key === Qt.Key_Back) {
-            if (stackView.depth > 1) {
-                stackView.pop();
-                event.accepted = true;
-            } else { Qt.quit(); }
-        }
-    }
-
     toolBar: BorderImage {
         border.bottom: 8
         source: "images/toolbar.png"
@@ -133,6 +123,12 @@ ApplicationWindow {
     StackView {
         id: stackView
         anchors.fill: parent
+        // Implements back key navigation
+        focus: true
+        Keys.onReleased: if (event.key === Qt.Key_Back && stackView.depth > 1) {
+                             stackView.pop();
+                             event.accepted = true;
+                         }
 
         initialItem: Item {
             width: parent.width