From edea70f3d24751d6030e54b0ad15b5687fb86193 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Wed, 21 Mar 2012 13:10:07 +0100 Subject: [PATCH] Filter accessible objects. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Only include objects in the hierarchy if either they or their descendants are accessible. Change-Id: I4ed01ccfa2b095a5205f72af97acb6c8dbaa3e74 Reviewed-by: Morten Johan Sørvig Reviewed-by: Jan-Arve Sæther --- src/plugins/accessible/quick/qaccessiblequickitem.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.cpp b/src/plugins/accessible/quick/qaccessiblequickitem.cpp index 45db9fa795..d282b04eaf 100644 --- a/src/plugins/accessible/quick/qaccessiblequickitem.cpp +++ b/src/plugins/accessible/quick/qaccessiblequickitem.cpp @@ -135,7 +135,14 @@ QList QAccessibleQuickItem::childItems() const role() == QAccessible::PageTab || role() == QAccessible::ProgressBar) return QList(); - return item()->childItems(); + + QList items; + Q_FOREACH (QQuickItem *child, item()->childItems()) { + QQuickItemPrivate *itemPrivate = QQuickItemPrivate::get(child); + if (itemPrivate->isAccessible) + items.append(child); + } + return items; } QAccessible::State QAccessibleQuickItem::state() const