Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	configure
	mkspecs/features/create_cmake.prf

Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5

1 files changed, 1 insertions, 15 deletions

diff --git a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
index 331a66417d..86e5066fbb 100644
--- a/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
+++ b/src/plugins/platforms/cocoa/qnsviewaccessibility.mm
@@ -74,21 +74,7 @@
     } else if ([attribute isEqualToString:NSAccessibilityChildrenAttribute]) {
         if (!m_window->accessibleRoot())
             return [super accessibilityAttributeValue:attribute];
-
-        // Create QCocoaAccessibleElements for each child if the
-        // root accessible interface.
-        int numKids = m_window->accessibleRoot()->childCount();
-        NSMutableArray *kids = [NSMutableArray arrayWithCapacity:numKids];
-        for (int i = 0; i < numKids; ++i) {
-            QAccessibleInterface *child = m_window->accessibleRoot()->child(i);
-            Q_ASSERT(child);
-            QAccessible::Id childAxid = QAccessible::uniqueId(child);
-            QCocoaAccessibleElement *element = [QCocoaAccessibleElement createElementWithId:childAxid parent:self];
-            [kids addObject: element];
-            [element release];
-        }
-
-        return NSAccessibilityUnignoredChildren(kids);
+        return QCocoaAccessible::unignoredChildren(self, m_window->accessibleRoot());
     } else {
         return [super accessibilityAttributeValue:attribute];
     }