diff options
| author | Jiang Jiang <jiang.jiang@nokia.com> | 2010-11-12 12:56:52 (GMT) |
|---|---|---|
| committer | Jiang Jiang <jiang.jiang@nokia.com> | 2010-11-12 13:15:16 (GMT) |
| commit | 215deeabaeba359a9b24681f33f99b80060c4fb1 (patch) | |
| tree | e6014d83d06876df1484f864793dc5174a345552 | |
| parent | 344a4dcfe847dd778c33d1a852381672dd331409 (diff) | |
| download | Qt-215deeabaeba359a9b24681f33f99b80060c4fb1.zip Qt-215deeabaeba359a9b24681f33f99b80060c4fb1.tar.gz Qt-215deeabaeba359a9b24681f33f99b80060c4fb1.tar.bz2 | |
Use correct font for menu item shortcuts
We used to use kThemeMenuItemCmdKeyFont for drawing menu item
shortcuts, however, Apple is using the same font for both menu
item text and shortcuts, it's likely that kThemeMenuItemCmdKeyFont
is no longer valid. Change it to kThemeMenuItemFont will make the
font for shortcuts consistent with other Mac applications.
Task-number: QTBUG-15230
Reviewed-by: Fabien Freling
| -rw-r--r-- | src/gui/kernel/qapplication_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm index e5364d0..3aafeb4 100644 --- a/src/gui/kernel/qapplication_mac.mm +++ b/src/gui/kernel/qapplication_mac.mm @@ -549,7 +549,7 @@ void qt_mac_update_os_settings() FontMap("QTipLabel", kThemeSmallSystemFont), FontMap("QLabel", kThemeSystemFont), FontMap("QToolButton", kThemeSmallSystemFont), - FontMap("QMenuItem", kThemeMenuItemCmdKeyFont), // It doesn't exist, but its unique. + FontMap("QMenuItem", kThemeMenuItemFont), // It doesn't exist, but its unique. FontMap("QComboLineEdit", kThemeViewsFont), // It doesn't exist, but its unique. FontMap("QSmallFont", kThemeSmallSystemFont), // It doesn't exist, but its unique. FontMap("QMiniFont", kThemeMiniSystemFont), // It doesn't exist, but its unique. |