diff options
| author | Fabien Freling <fabien.freling@nokia.com> | 2010-03-26 11:34:54 (GMT) |
|---|---|---|
| committer | Fabien Freling <fabien.freling@nokia.com> | 2010-03-26 11:35:22 (GMT) |
| commit | c19cb39ddbfd93802bfe61ecaa4f737a1bd1c1bb (patch) | |
| tree | 14332be59fb6e3835c42bf7d0feb37b69a60a03f /src/gui/widgets/qmenu_mac.mm | |
| parent | 9a7dd6c047a8eebad94fd5f3e9fc2284c315b046 (diff) | |
| download | Qt-c19cb39ddbfd93802bfe61ecaa4f737a1bd1c1bb.zip Qt-c19cb39ddbfd93802bfe61ecaa4f737a1bd1c1bb.tar.gz Qt-c19cb39ddbfd93802bfe61ecaa4f737a1bd1c1bb.tar.bz2 | |
Fix the bug where the ampersand symbol would be discarded.
We are now checking that the QAction is not related
to the About or Quit button on Mac OS X
Task-number: QTBUG-7540
Reviewed-by: Morten Sorvig
Diffstat (limited to 'src/gui/widgets/qmenu_mac.mm')
| -rw-r--r-- | src/gui/widgets/qmenu_mac.mm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm index 9a14ce6..6a0eb53 100644 --- a/src/gui/widgets/qmenu_mac.mm +++ b/src/gui/widgets/qmenu_mac.mm @@ -1391,7 +1391,11 @@ QMenuPrivate::QMacMenuPrivate::syncAction(QMacMenuAction *action) } else { [item setTitle: qt_mac_QStringToNSString(finalString)]; } - [item setTitle:qt_mac_QStringToNSString(qt_mac_removeMnemonics(text))]; + + if (action->action->menuRole() == QAction::AboutRole || action->action->menuRole() == QAction::QuitRole) + [item setTitle:qt_mac_QStringToNSString(text)]; + else + [item setTitle:qt_mac_QStringToNSString(qt_mac_removeMnemonics(text))]; // Cocoa Enabled [item setEnabled: action->action->isEnabled()]; |