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>

2 files changed, 9 insertions, 5 deletions

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index ce56bd661d..e030144676 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -622,7 +622,7 @@ void QQuickKeyNavigationAttached::keyPressed(QKeyEvent *event, bool post)
             mirror = QQuickItemPrivate::get(parentItem)->effectiveLayoutMirror;
         QQuickItem* leftItem = mirror ? d->right : d->left;
         if (leftItem) {
-            setFocusNavigation(leftItem, mirror ? "right" : "left");
+            setFocusNavigation(leftItem, mirror ? "right" : "left", mirror ? Qt::TabFocusReason : Qt::BacktabFocusReason);
             event->accept();
         }
         break;
@@ -632,20 +632,20 @@ void QQuickKeyNavigationAttached::keyPressed(QKeyEvent *event, bool post)
             mirror = QQuickItemPrivate::get(parentItem)->effectiveLayoutMirror;
         QQuickItem* rightItem = mirror ? d->left : d->right;
         if (rightItem) {
-            setFocusNavigation(rightItem, mirror ? "left" : "right");
+            setFocusNavigation(rightItem, mirror ? "left" : "right", mirror ? Qt::BacktabFocusReason : Qt::TabFocusReason);
             event->accept();
         }
         break;
     }
     case Qt::Key_Up:
         if (d->up) {
-            setFocusNavigation(d->up, "up");
+            setFocusNavigation(d->up, "up", Qt::BacktabFocusReason);
             event->accept();
         }
         break;
     case Qt::Key_Down:
         if (d->down) {
-            setFocusNavigation(d->down, "down");
+            setFocusNavigation(d->down, "down", Qt::TabFocusReason);
             event->accept();
         }
         break;
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;