Fix QAccessibleQuickWindow::focusChild() to return focused descendant

Same as the focusChild fix for qtbase:
a132e02540 Fix QAccessibleWidget::focusChild() to return focused descendant

Task-number: QTBUG-78284
Change-Id: Ibc3e3287790ebc879513a5b1a739e3a919e1f038
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/quick/accessible/qaccessiblequickview.cpp b/src/quick/accessible/qaccessiblequickview.cpp
index 41a02fc09c..b23b0316f5 100644
--- a/src/quick/accessible/qaccessiblequickview.cpp
+++ b/src/quick/accessible/qaccessiblequickview.cpp
@@ -84,8 +84,12 @@ QAccessibleInterface *QAccessibleQuickWindow::child(int index) const
 QAccessibleInterface *QAccessibleQuickWindow::focusChild() const
 {
     QObject *focusObject = window()->focusObject();
-    if (focusObject)
-        return QAccessible::queryAccessibleInterface(focusObject);
+    if (focusObject) {
+        QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(focusObject);
+        if (!iface || iface == this || !iface->focusChild())
+            return iface;
+        return iface->focusChild();
+    }
     return nullptr;
 }