1
From 3046e8f275c60f518da31acd054452d226798f54 Mon Sep 17 00:00:00 2001
2
From: Frederik Gladhorn <frederik.gladhorn@nokia.com>
3
Date: Fri, 23 Sep 2011 14:23:52 +0200
4
Subject: [PATCH] Fix accessible menu not returning child name.
6
When accessible name is set, QAccessibleMenu would always return
7
the menu's name, not that of the child action.
9
Task-Number: QTBUG-21578
11
(cherry picked from commit 3df9ac2f0719718ceb7385e46445447d95fd7857)
13
src/plugins/accessible/widgets/qaccessiblemenu.cpp | 2 +-
14
tests/auto/qaccessibility/tst_qaccessibility.cpp | 6 ++++++
15
2 files changed, 7 insertions(+), 1 deletions(-)
17
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
18
index 1454c7c..59e92c7 100644
19
--- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp
20
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
21
@@ -93,7 +93,7 @@ int QAccessibleMenu::childAt(int x, int y) const
22
QString QAccessibleMenu::text(Text t, int child) const
24
QString tx = QAccessibleWidgetEx::text(t, child);
26
+ if (!child && tx.size())