Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta3

Change-Id: Ice7d2ed56c85521a946b218d84087b255d3613ae

1 files changed, 51 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_combobox.qml b/tests/auto/controls/data/tst_combobox.qml
index 70c4f090..0d266e1a 100644
--- a/tests/auto/controls/data/tst_combobox.qml
+++ b/tests/auto/controls/data/tst_combobox.qml
@@ -85,6 +85,17 @@ TestCase {
         MouseArea { }
     }
 
+    Component {
+        id: customPopup
+        Popup {
+            width: 100
+            implicitHeight: contentItem.implicitHeight
+            contentItem: TextInput {
+                anchors.fill: parent
+            }
+        }
+    }
+
     function init() {
         // QTBUG-61225: Move the mouse away to avoid QQuickWindowPrivate::flushFrameSynchronousEvents()
         // delivering interfering hover events based on the last mouse position from earlier tests. For
@@ -1680,4 +1691,44 @@ TestCase {
         compare(container.releasedKeys, ++releasedKeys)
         compare(container.lastReleasedKey, data.key)
     }
+
+    function test_popupFocus_QTBUG_74661() {
+        var control = createTemporaryObject(comboBox, testCase)
+        verify(control)
+
+        var popup = createTemporaryObject(customPopup, testCase)
+        verify(popup)
+
+        control.popup = popup
+
+        var openedSpy = signalSpy.createObject(control, {target: popup, signalName: "opened"})
+        verify(openedSpy.valid)
+
+        var closedSpy = signalSpy.createObject(control, {target: popup, signalName: "closed"})
+        verify(closedSpy.valid)
+
+        control.forceActiveFocus()
+        verify(control.activeFocus)
+
+        // show popup
+        keyClick(Qt.Key_Space)
+        openedSpy.wait()
+        compare(openedSpy.count, 1)
+
+        popup.contentItem.forceActiveFocus()
+        verify(popup.contentItem.activeFocus)
+
+        // type something in the text field
+        keyClick(Qt.Key_Space)
+        keyClick(Qt.Key_H)
+        keyClick(Qt.Key_I)
+        compare(popup.contentItem.text, " hi")
+
+        compare(closedSpy.count, 0)
+
+        // hide popup
+        keyClick(Qt.Key_Escape)
+        closedSpy.wait()
+        compare(closedSpy.count, 1)
+    }
 }