diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-08-20 14:32:29 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-09-04 14:50:36 +0200 |
| commit | 68206db907f2f973986e816589d2a349708e6acc (patch) | |
| tree | 29d3b3a3503defbf09895b9b7f37b9805ea47f60 /src/widgets/accessible/qaccessiblemenu.cpp | |
| parent | 52f859604ddc12d273111644bbfd78f7f8a030ea (diff) | |
Improve accelerator stripping in accessible widgets
When we strip the & we should also report the hotkey.
In addition only strip labels when they are buddys and try not to remove
ampersands from all kinds of random text.
This fixes https://bugs.kde.org/show_bug.cgi?id=338282
Change-Id: I401281cd9ff43b23a3923ad9909ca9c469b59506
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Diffstat (limited to 'src/widgets/accessible/qaccessiblemenu.cpp')
| -rw-r--r-- | src/widgets/accessible/qaccessiblemenu.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/widgets/accessible/qaccessiblemenu.cpp b/src/widgets/accessible/qaccessiblemenu.cpp index f47980d786..82c3675508 100644 --- a/src/widgets/accessible/qaccessiblemenu.cpp +++ b/src/widgets/accessible/qaccessiblemenu.cpp @@ -294,8 +294,7 @@ QString QAccessibleMenuItem::text(QAccessible::Text t) const QString str; switch (t) { case QAccessible::Name: - str = m_action->text(); - str = qt_accStripAmp(str); + str = qt_accStripAmp(m_action->text()); break; case QAccessible::Accelerator: { #ifndef QT_NO_SHORTCUT |