diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:36:51 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:36:51 (GMT) |
| commit | 21e7b562ab94514fa702b23214aa8aeb26140412 (patch) | |
| tree | 7762703eb5abc552e411f739b3284dc2651e821e /src/gui/text/qfontengine_mac.mm | |
| parent | 32e6e9c9353dd7d9ad80f12223698e1098047f6a (diff) | |
| parent | 9e4f5f2133b542cdf6f32f2fc96dccd864e68420 (diff) | |
| download | Qt-21e7b562ab94514fa702b23214aa8aeb26140412.zip Qt-21e7b562ab94514fa702b23214aa8aeb26140412.tar.gz Qt-21e7b562ab94514fa702b23214aa8aeb26140412.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/text/qfontengine_mac.mm')
| -rw-r--r-- | src/gui/text/qfontengine_mac.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm index 943e3ab..007f2d4 100644 --- a/src/gui/text/qfontengine_mac.mm +++ b/src/gui/text/qfontengine_mac.mm @@ -1019,6 +1019,8 @@ bool QFontEngineMacMulti::stringToCMapInternal(const QChar *str, int len, QGlyph | kATSLineDisableAllJustification ; + layopts |= kATSLineUseDeviceMetrics; + if (fontDef.styleStrategy & QFont::NoAntialias) layopts |= kATSLineNoAntiAliasing; |