summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Dettman <dean.dettman@nokia.com>2009-10-20 10:28:32 (GMT)
committerDean Dettman <dean.dettman@nokia.com>2009-10-20 10:28:32 (GMT)
commitf779d9f7e317ff3e10f015a05d349e1fa3e7ab84 (patch)
tree9f713600f2ad76754e3169c1289e2ec854c75045
parentcc57e64eb54cf85a9c6ece2496df7540f0f3c9d8 (diff)
downloadQt-f779d9f7e317ff3e10f015a05d349e1fa3e7ab84.zip
Qt-f779d9f7e317ff3e10f015a05d349e1fa3e7ab84.tar.gz
Qt-f779d9f7e317ff3e10f015a05d349e1fa3e7ab84.tar.bz2
make missing Key_Back and Key_Forward menu glyphs return 0 on mac(cocoa)
This is an addition to commit 5651d2547261ccecbf50f8141c634f59c0adc00d to make it obvious that in cocoa nothing is returned. Task-number: QTBUG-4873 Reviewed-by: MortenS
-rw-r--r--src/gui/widgets/qmenu_mac.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qmenu_mac.mm b/src/gui/widgets/qmenu_mac.mm
index 0f92ad9..ec9313f 100644
--- a/src/gui/widgets/qmenu_mac.mm
+++ b/src/gui/widgets/qmenu_mac.mm
@@ -1244,9 +1244,9 @@ NSString *keySequenceToKeyEqivalent(const QKeySequence &accel)
else if (accel_key == Qt::Key_End)
keyEquiv[0] = NSEndFunctionKey;
else if (accel_key == Qt::Key_Back)
- keyEquiv[0] = kMenuLeftArrowDashedGlyph; // ### Cocoa has no equivalent - no icon is displayed
+ keyEquiv[0] = 0 ; // ### could not find Cocoa equivalent to kMenuLeftArrowDashedGlyph
else if (accel_key == Qt::Key_Forward)
- keyEquiv[0] = kMenuRightArrowDashedGlyph; // ### Cocoa has no equivalent - no icon is displayed
+ 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];