summaryrefslogtreecommitdiffstats
path: root/src/plugins/accessible/widgets/qaccessiblemenu.cpp
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@nokia.com>2011-09-23 12:23:52 (GMT)
committerFrederik Gladhorn <frederik.gladhorn@nokia.com>2011-09-23 16:56:44 (GMT)
commit3df9ac2f0719718ceb7385e46445447d95fd7857 (patch)
tree3c48ec43095916885590cf9c2faa6bc182eac298 /src/plugins/accessible/widgets/qaccessiblemenu.cpp
parent244ccf1cd7434b4f9ef4dbcdb39ae5c70610952c (diff)
downloadQt-3df9ac2f0719718ceb7385e46445447d95fd7857.zip
Qt-3df9ac2f0719718ceb7385e46445447d95fd7857.tar.gz
Qt-3df9ac2f0719718ceb7385e46445447d95fd7857.tar.bz2
Fix accessible menu not returning child name.
When accessible name is set, QAccessibleMenu would always return the menu's name, not that of the child action. Task-Number: QTBUG-21578 Reviewed-by: Jan-Arve
Diffstat (limited to 'src/plugins/accessible/widgets/qaccessiblemenu.cpp')
-rw-r--r--src/plugins/accessible/widgets/qaccessiblemenu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/accessible/widgets/qaccessiblemenu.cpp b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
index 4ae1d15..e9e5ca8 100644
--- a/src/plugins/accessible/widgets/qaccessiblemenu.cpp
+++ b/src/plugins/accessible/widgets/qaccessiblemenu.cpp
@@ -93,7 +93,7 @@ int QAccessibleMenu::childAt(int x, int y) const
QString QAccessibleMenu::text(Text t, int child) const
{
QString tx = QAccessibleWidgetEx::text(t, child);
- if (tx.size())
+ if (!child && tx.size())
return tx;
switch (t) {