diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 11:00:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 12:10:33 +0000 |
commit | 4f3379352a265bab00a7265f85ffc38a9ca4ffe4 (patch) | |
tree | 19930057569fa270a8c8633172f5ff321543ecfc /tests | |
parent | 5de27a90e5771535365bc2d1b5c1241368877bf8 (diff) |
QQuickItem: correct focus reason for key navigation
Before we used Qt::OtherFocusReason for normal key navigation, such
as up/down/left/right. But in style world, the reason is critical
for focus change.
Now we follow the way in widgets world, use Qt::TabFocusReason and
Qt::BacktabFocusReason for down/up and right/left(or reversed if
mirrored).
Task-number: QTBUG-41801
Change-Id: I99e97ea4ced2cef9b3280c578c3a463de8fe1727
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/auto/quick/qquickitem2/tst_qquickitem.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp index 9f3de8292f..f3351fcc4e 100644 --- a/tests/auto/quick/qquickitem2/tst_qquickitem.cpp +++ b/tests/auto/quick/qquickitem2/tst_qquickitem.cpp @@ -2089,10 +2089,14 @@ void tst_QQuickItem::keyNavigation_focusReason() QVERIFY(key.isAccepted()); QCOMPARE(focusEventFilter.lastFocusReason, Qt::BacktabFocusReason); - // some arbitrary cursor key + // right - it's also one kind of key navigation key = QKeyEvent(QEvent::KeyPress, Qt::Key_Right, Qt::NoModifier, "", false, 1); QGuiApplication::sendEvent(window, &key); QVERIFY(key.isAccepted()); + QCOMPARE(focusEventFilter.lastFocusReason, Qt::TabFocusReason); + + item->setFocus(true, Qt::OtherFocusReason); + QVERIFY(item->hasActiveFocus()); QCOMPARE(focusEventFilter.lastFocusReason, Qt::OtherFocusReason); delete window; |