diff options
| author | Trond Kjernåsen <trond@trolltech.com> | 2009-09-24 12:51:53 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:52:22 (GMT) |
| commit | 1590701ed51bf81e6052c9dad28d0c29bf3bb4e1 (patch) | |
| tree | f05e635554bcb6fdee6e19ffd4b7956f8954bba4 | |
| parent | 983261bcc4789061756540285191e5ed7b6355b6 (diff) | |
| download | Qt-1590701ed51bf81e6052c9dad28d0c29bf3bb4e1.zip Qt-1590701ed51bf81e6052c9dad28d0c29bf3bb4e1.tar.gz Qt-1590701ed51bf81e6052c9dad28d0c29bf3bb4e1.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
(cherry picked from commit d04c169e424c0feee61763764e841ef132ba359f)
| -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 8e723f6..e5e821f 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; |