diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-27 11:42:59 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-11-27 11:42:59 (GMT) |
| commit | 00d5e1bc789cd27d2decb150426a1c7620c73bc9 (patch) | |
| tree | 6fabea2ba754fb382fbb5130dbd7b7611b9e9a04 /src/gui/dialogs/qfontdialog_mac.mm | |
| parent | 9e68da0680d5b85a0713142df9b7ad9674960353 (diff) | |
| parent | c91ccab6f4ae1f7dd8c2c7103d6d63e7725b9eeb (diff) | |
| download | Qt-00d5e1bc789cd27d2decb150426a1c7620c73bc9.zip Qt-00d5e1bc789cd27d2decb150426a1c7620c73bc9.tar.gz Qt-00d5e1bc789cd27d2decb150426a1c7620c73bc9.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
Diffstat (limited to 'src/gui/dialogs/qfontdialog_mac.mm')
| -rw-r--r-- | src/gui/dialogs/qfontdialog_mac.mm | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm index 5b0983b..0c467cd 100644 --- a/src/gui/dialogs/qfontdialog_mac.mm +++ b/src/gui/dialogs/qfontdialog_mac.mm @@ -625,10 +625,11 @@ void QFontDialogPrivate::setFont(void *delegate, const QFont &font) } NSFontManager *mgr = [NSFontManager sharedFontManager]; - nsFont = [mgr fontWithFamily:qt_mac_QStringToNSString(font.family()) + QFontInfo fontInfo(font); + nsFont = [mgr fontWithFamily:qt_mac_QStringToNSString(fontInfo.family()) traits:mask weight:weight - size:QFontInfo(font).pointSize()]; + size:fontInfo.pointSize()]; } [mgr setSelectedFont:nsFont isMultiple:NO]; |