summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-10-06 07:45:52 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-10-06 08:16:41 (GMT)
commit146988463cc0d03be415aa8ff07031b6bcf27975 (patch)
treebd8f9ddeb1bb7b321ecdb9613d0fe96426d809b0
parent37bd7a5711e57ea8c45ae75102ddee3ab905a0e5 (diff)
downloadQt-146988463cc0d03be415aa8ff07031b6bcf27975.zip
Qt-146988463cc0d03be415aa8ff07031b6bcf27975.tar.gz
Qt-146988463cc0d03be415aa8ff07031b6bcf27975.tar.bz2
Fix tst_QFontDialog::setFont
The font size was not respected because it is taken from the request which could only contains the pixel size. Reviewed-by: Richard
-rw-r--r--src/gui/dialogs/qfontdialog_mac.mm2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm
index dacb54c..5b0983b 100644
--- a/src/gui/dialogs/qfontdialog_mac.mm
+++ b/src/gui/dialogs/qfontdialog_mac.mm
@@ -628,7 +628,7 @@ void QFontDialogPrivate::setFont(void *delegate, const QFont &font)
nsFont = [mgr fontWithFamily:qt_mac_QStringToNSString(font.family())
traits:mask
weight:weight
- size:font.pointSize()];
+ size:QFontInfo(font).pointSize()];
}
[mgr setSelectedFont:nsFont isMultiple:NO];