diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-10-21 07:42:29 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-10-21 07:42:29 (GMT) |
| commit | a3e38f1a2a7990d541dd9d49899b5488ae64a466 (patch) | |
| tree | 2b6eacecf0726195cd375dc19f8aa673a81c320f /src | |
| parent | 9964c9461bfb80a0ee1bb830c3c3e0dd3aa75f53 (diff) | |
| parent | 58574ea3590fbb28da5be73b983d83f0a8824d00 (diff) | |
| download | Qt-a3e38f1a2a7990d541dd9d49899b5488ae64a466.zip Qt-a3e38f1a2a7990d541dd9d49899b5488ae64a466.tar.gz Qt-a3e38f1a2a7990d541dd9d49899b5488ae64a466.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qmenu_mac.mm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm index c3b954f..ec9313f 100644 --- a/src/gui/widgets/qmenu_mac.mm +++ b/src/gui/widgets/qmenu_mac.mm @@ -572,6 +572,10 @@ static void qt_mac_get_accel(quint32 accel_key, quint32 *modif, quint32 *key) { *key = kMenuNorthwestArrowGlyph; else if (accel_key == Qt::Key_End) *key = kMenuSoutheastArrowGlyph; + else if (accel_key == Qt::Key_Back) + *key = kMenuLeftArrowDashedGlyph; + else if (accel_key == Qt::Key_Forward) + *key = kMenuRightArrowDashedGlyph; } } #else // Cocoa @@ -1239,6 +1243,10 @@ NSString *keySequenceToKeyEqivalent(const QKeySequence &accel) keyEquiv[0] = NSHomeFunctionKey; else if (accel_key == Qt::Key_End) keyEquiv[0] = NSEndFunctionKey; + else if (accel_key == Qt::Key_Back) + keyEquiv[0] = 0 ; // ### could not find Cocoa equivalent to kMenuLeftArrowDashedGlyph + else if (accel_key == Qt::Key_Forward) + keyEquiv[0] = 0 ; // ### could not find Cocoa equivalent to kMenuRightArrowDashedGlyph else keyEquiv[0] = unichar(QChar(accel_key).toLower().unicode()); return [NSString stringWithCharacters:keyEquiv length:1]; |