diff options
| author | Kavindra Devi Palaraja <kavindra.palaraja@nokia.com> | 2009-06-23 08:38:38 (GMT) |
|---|---|---|
| committer | Kavindra Devi Palaraja <kavindra.palaraja@nokia.com> | 2009-06-23 08:38:38 (GMT) |
| commit | 4f4ef9a1d0aa1aa4f061395206cda805e4ea9a5a (patch) | |
| tree | d974bbdcb72b09d4cc875903fbd434b0c000a5c6 | |
| parent | 764a3dd99072cde27fdf7887cd40f4db54796781 (diff) | |
| parent | adf322c514a5781dcb9ec304d44229fa47d5e8b3 (diff) | |
| download | Qt-4f4ef9a1d0aa1aa4f061395206cda805e4ea9a5a.zip Qt-4f4ef9a1d0aa1aa4f061395206cda805e4ea9a5a.tar.gz Qt-4f4ef9a1d0aa1aa4f061395206cda805e4ea9a5a.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | src/gui/text/qfontengine_mac.mm | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm index d43ef15..327df45 100644 --- a/src/gui/text/qfontengine_mac.mm +++ b/src/gui/text/qfontengine_mac.mm @@ -1019,11 +1019,6 @@ bool QFontEngineMacMulti::stringToCMapInternal(const QChar *str, int len, QGlyph | kATSLineDisableAllJustification ; - if (!(flags & QTextEngine::DesignMetrics)) { - layopts |= kATSLineFractDisable | kATSLineUseDeviceMetrics - | kATSLineDisableAutoAdjustDisplayPos; - } - if (fontDef.styleStrategy & QFont::NoAntialias) layopts |= kATSLineNoAntiAliasing; |