From d04c169e424c0feee61763764e841ef132ba359f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= <trond@trolltech.com>
Date: Thu, 24 Sep 2009 14:51:53 +0200
Subject: 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
---
 src/gui/text/qfontengine_mac.mm | 2 ++
 1 file changed, 2 insertions(+)

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;
 
-- 
cgit v0.12