summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTrond Kjernåsen <trond@trolltech.com>2009-09-24 12:51:53 (GMT)
committerTrond Kjernåsen <trond@trolltech.com>2009-09-24 12:58:12 (GMT)
commitd04c169e424c0feee61763764e841ef132ba359f (patch)
treea631d3352827822dbe29452b5eb6ce996fb913a3 /src
parent600cef0aa62dedafac9190809230e01e3b200356 (diff)
downloadQt-d04c169e424c0feee61763764e841ef132ba359f.zip
Qt-d04c169e424c0feee61763764e841ef132ba359f.tar.gz
Qt-d04c169e424c0feee61763764e841ef132ba359f.tar.bz2
Fixed text drawing regression in Assistant.
Revert parts of adf322c514a5781dcb9ec304d44229fa47d5e8b3 to get this to work as in 4.5.2 again. What the original patch fixed, we don't really know.. Reviewed-by: Simon Hausmann
Diffstat (limited to 'src')
-rw-r--r--src/gui/text/qfontengine_mac.mm2
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;