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

Conflicts:
	tests/auto/popup/tst_popup.cpp

Change-Id: I32e6c6b646a00f8805cb82d181417db60a6fe6c8

1 files changed, 19 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml
index 097180b8..f4b7fc4a 100644
--- a/tests/auto/controls/data/tst_stackview.qml
+++ b/tests/auto/controls/data/tst_stackview.qml
@@ -786,6 +786,19 @@ TestCase {
         compare(control.busy, false)
     }
 
+    function test_pushOnRemoved() {
+        var control = createTemporaryObject(stackView, testCase, { initialItem: component })
+        verify(control)
+
+        var item = control.push(component, StackView.Immediate)
+        verify(item)
+
+        item.StackView.onRemoved.connect(function() { control.push(component, StackView.Immediate) } )
+
+        // don't crash (QTBUG-62153)
+        control.pop(StackView.Immediate)
+    }
+
     Component {
         id: attachedItem
         Item {
@@ -1170,6 +1183,12 @@ TestCase {
         compare(item1.StackView.visible, true)
     }
 
+    function test_resolveInitialItem() {
+        var control = createTemporaryObject(stackView, testCase, {initialItem: "TestItem.qml"})
+        verify(control)
+        verify(control.currentItem)
+    }
+
     function test_resolve() {
         var control = createTemporaryObject(stackView, testCase)
         verify(control)