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

Conflicts:
	.qmake.conf
	tests/auto/controls/data/tst_stackview.qml

Change-Id: I54b55d51452e812315f97bcdfd1a8e361a427f56

1 files changed, 26 insertions, 1 deletions

diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml
index 9bbe5f4b..eaa8d14f 100644
--- a/tests/auto/controls/data/tst_stackview.qml
+++ b/tests/auto/controls/data/tst_stackview.qml
@@ -46,10 +46,12 @@ TestCase {
     id: testCase
     name: "Tests_StackView"
     when: windowShown
+    visible: true
     width: 400
     height: 400
 
     Item { id: anItem  }
+    TextField { id: textField }
     Component {
         id: pageComponent
         Item {}
@@ -57,7 +59,7 @@ TestCase {
 
     Component {
         id: stackComponent
-        StackView {}
+        StackView { }
     }
 
     function test_stackview() {
@@ -77,5 +79,28 @@ TestCase {
         var w = stack.width
         testCase.width = w + 333
         compare(stack.width, w)
+
+        stack.destroy()
+    }
+
+    function test_focus() {
+        var stack = stackComponent.createObject(testCase, {initialItem: anItem, width: testCase.width, height: testCase.height})
+        verify (stack !== null, "stackview created is null")
+        compare(stack.currentItem, anItem)
+
+        stack.forceActiveFocus()
+        verify(stack.activeFocus)
+
+        stack.push({item: textField, immediate: true})
+        compare(stack.currentItem, textField)
+        textField.forceActiveFocus()
+        verify(textField.activeFocus)
+
+        stack.pop({immediate: true})
+        compare(stack.currentItem, anItem)
+        verify(stack.activeFocus)
+        verify(!textField.activeFocus)
+
+        stack.destroy()
     }
 }