Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev

1 files changed, 17 insertions, 1 deletions

diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
index bc98d002f0..0b674b8d2f 100644
--- a/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
+++ b/src/plugins/platforms/cocoa/qcocoaaccessibilityelement.mm
@@ -417,7 +417,23 @@
 }
 
 - (id)accessibilityFocusedUIElement {
-    return NSAccessibilityUnignoredAncestor(self);
+    QAccessibleInterface *iface = QAccessible::accessibleInterface(axid);
+
+    if (!iface || !iface->isValid()) {
+        qWarning() << "FocusedUIElement for INVALID";
+        return nil;
+    }
+    QAccessibleInterface *childInterface = iface->focusChild();
+    if (childInterface) {
+        QAccessible::Id childAxid = QAccessible::uniqueId(childInterface);
+        // FIXME: parent could be wrong
+        QCocoaAccessibleElement *accessibleElement = [QCocoaAccessibleElement createElementWithId:childAxid parent:self];
+        [accessibleElement autorelease];
+        return accessibleElement;
+    }
+
+    // no focus found
+    return nil;
 }
 
 @end