diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 07:37:43 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-03-24 07:38:02 +0100 |
commit | 135ebe4f3d268121047fdbfee49f2dd52006165e (patch) | |
tree | 6b303103f36e69e29cfa860b8b7afc584c55d6f3 /src/plugins/platforms/cocoa/qcocoamenuitem.mm | |
parent | e7feb956280105113b3e58f12e5f32f54199a95a (diff) | |
parent | 1e8f50a8d069c97ea6a4f00d664c12e594884f54 (diff) |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: If5d2e621c2fa5476c3ab687a3f4620c54fc3b32e
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoamenuitem.mm')
-rw-r--r-- | src/plugins/platforms/cocoa/qcocoamenuitem.mm | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.mm b/src/plugins/platforms/cocoa/qcocoamenuitem.mm index d6813749a4..bf12c0f2ce 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.mm +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.mm @@ -44,6 +44,8 @@ #include <QtCore/QDebug> +QT_BEGIN_NAMESPACE + static inline QCocoaMenuLoader *getMenuLoader() { return [NSApp QT_MANGLE_NAMESPACE(qt_qcocoamenuLoader)]; @@ -72,6 +74,9 @@ NSString *keySequenceToKeyEqivalent(const QKeySequence &accel) QChar cocoa_key = qt_mac_qtKey2CocoaKey(Qt::Key(accel_key)); if (cocoa_key.isNull()) cocoa_key = QChar(accel_key).toLower().unicode(); + // Similar to qt_mac_removePrivateUnicode change the delete key so the symbol is correctly seen in native menubar + if (cocoa_key.unicode() == NSDeleteFunctionKey) + cocoa_key = NSDeleteCharacter; return [NSString stringWithCharacters:&cocoa_key.unicode() length:1]; } @@ -420,3 +425,5 @@ void QCocoaMenuItem::setIconSize(int size) { m_iconSize = size; } + +QT_END_NAMESPACE |