From a06cb56dde937c67f9d5baf870d6327d0d3c4c78 Mon Sep 17 00:00:00 2001
From: Jan-Arve Saether <jan-arve.saether@nokia.com>
Date: Thu, 22 Sep 2011 17:21:36 +0200
Subject: Use QGuiApp::activeWindow()->accessibleRoot() to find focus child

queryAccessibleInterface will return 0 if the object is a QWindow, so
it would never find the focus child.

Change-Id: Ib5bb6a0e4ffbf1b8491b71d1ba5a039e7a6584e0
Reviewed-on: http://codereview.qt-project.org/5842
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
---
 src/gui/accessible/qaccessibleobject.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp
index af329438c4..8fcab7f3f6 100644
--- a/src/gui/accessible/qaccessibleobject.cpp
+++ b/src/gui/accessible/qaccessibleobject.cpp
@@ -312,7 +312,10 @@ int QAccessibleApplication::navigate(RelationFlag relation, int entry,
         targetObject = object();
         break;
     case FocusChild:
-        targetObject = QGuiApplication::activeWindow();
+        if (QWindow *window = QGuiApplication::activeWindow()) {
+            *target = window->accessibleRoot();
+            return 0;
+        }
         break;
     case Ancestor:
         *target = parent();
-- 
cgit v1.2.3