diff options
| author | Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> | 2014-03-28 11:15:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-21 13:59:18 +0200 |
| commit | ff31090d07cbbb6f67d259438939e810a0baf67f (patch) | |
| tree | 67b51072828e2e1c1466792c206b184434a8a98b /src | |
| parent | c045cb950b3610278b4257712eca88d4e3ecf9fd (diff) | |
Cocoa: Do not process ampersands in menus twice.
When syncing between QAction and native NSMenuItems, the ampersands
(mnemonics) were removed twice. This lead to double ampersands being
removed instead of replace with single ones.
Task-number: QTBUG-37933
Change-Id: If1d9cd247b467472647b22b38460b44b03f13d82
Reviewed-by: Liang Qi <liang.qi@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuitem.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm index 9e748bff72..32692edde4 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm @@ -119,7 +119,7 @@ QCocoaMenuItem::~QCocoaMenuItem() void QCocoaMenuItem::setText(const QString &text) { - m_text = qt_mac_removeAmpersandEscapes(text); + m_text = text; } void QCocoaMenuItem::setIcon(const QIcon &icon) |