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

Change-Id: I47fbec425594386f529623f2dcbddd7ec7a09ee7

1 files changed, 11 insertions, 0 deletions

diff --git a/tests/auto/controls/data/tst_spinbox.qml b/tests/auto/controls/data/tst_spinbox.qml
index 6c4f15c5..17e4b592 100644
--- a/tests/auto/controls/data/tst_spinbox.qml
+++ b/tests/auto/controls/data/tst_spinbox.qml
@@ -51,6 +51,7 @@
 import QtQuick 2.2
 import QtTest 1.0
 import QtQuick.Controls 2.2
+import QtQuick.Window 2.3
 
 TestCase {
     id: testCase
@@ -399,6 +400,16 @@ TestCase {
         compare(control.value, 100)
     }
 
+    function test_initialFocus() {
+        var window = testCase.Window.window
+        verify(window)
+        compare(window.activeFocusItem, window.contentItem)
+
+        var control = createTemporaryObject(spinBox, testCase, { editable: true, focus: true })
+        verify(control)
+        tryCompare(control.contentItem, "activeFocus", true)
+    }
+
     function test_editable() {
         var control = createTemporaryObject(spinBox, testCase)
         verify(control)