diff options
author | Mitch Curtis <mitch.curtis@qt.io> | 2016-05-10 12:44:15 +0200 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-05-11 20:34:14 +0000 |
commit | eb6e122c68333382309843ad96e7d04d2c5a3595 (patch) | |
tree | e0bcabf84ae8822382d17b802445f5b456580ad5 /tests/auto/focus | |
parent | 25ef915acd941f0c8db3f7102a2deeaab17e6d14 (diff) |
Popup: restore focus to contentItem of ApplicationWindow when closing
In Controls2, Popup and normal content are in same window, then we
should maintain the focus restore work.
Task-number: QTBUG-53275
Change-Id: I57f5aaf3febf1b7d2071c1734d8561932f95c699
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'tests/auto/focus')
-rw-r--r-- | tests/auto/focus/tst_focus.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/focus/tst_focus.cpp b/tests/auto/focus/tst_focus.cpp index 6c184851..2c9573c6 100644 --- a/tests/auto/focus/tst_focus.cpp +++ b/tests/auto/focus/tst_focus.cpp @@ -228,7 +228,7 @@ void tst_focus::reason() QEXPECT_FAIL("TextField", "TODO: TextField::visualFocus?", Continue); QCOMPARE(control->property("visualFocus"), QVariant(false)); - window->contentItem()->forceActiveFocus(Qt::TabFocusReason); + window->contentItem()->setFocus(false, Qt::TabFocusReason); QVERIFY(!control->hasActiveFocus()); QCOMPARE(control->property("focusReason").toInt(), int(Qt::TabFocusReason)); |