1 files changed, 18 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
index c43c0b5068..6ebb1f6ba8 100644
--- a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
+++ b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
@@ -106,9 +106,27 @@
 
     // Hit a child, forward to child accessible interface.
     QAccessible::Id childAxid = QAccessible::uniqueId(childInterface);
+    // FIXME: parent could be wrong
     QCocoaAccessibleElement *accessibleElement = [QCocoaAccessibleElement createElementWithId:childAxid parent:self ];
     [accessibleElement autorelease];
     return [accessibleElement accessibilityHitTest:point];
 }
 
+- (id)accessibilityFocusedUIElement {
+    if (!m_window->accessibleRoot())
+        return [super accessibilityFocusedUIElement];
+
+    QAccessibleInterface *childInterface = m_window->accessibleRoot()->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;
+    }
+
+    // should not happen
+    return nil;
+}
+
 @end