Remove historical +1 from font height calculation
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Fri, 3 Feb 2012 13:28:16 +0000 (14:28 +0100)
committerQt by Nokia <qt-info@nokia.com>
Fri, 17 Feb 2012 04:26:44 +0000 (05:26 +0100)
commitcb8445f0323b0eefbb04f1d8adad81a00b53abd8
tree502411d2ce366cb25a1ac9424eb314c320ece905
parent2801db558c56e98753e297c1aeabd4fd2975e09a
Remove historical +1 from font height calculation

Historically, we've calculated font height as ascent+descent+1.
In Qt 4, a patch was added to work around this by subtracting
1 from the descent of the font engines. We now remove the +1 and
the work arounds.

Change-Id: I7e25d49b97ac892015d3328f32d70eb9a7c2d88f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
src/gui/text/qabstracttextdocumentlayout.cpp
src/gui/text/qfontengine_ft.cpp
src/gui/text/qfontenginedirectwrite.cpp
src/gui/text/qfontmetrics.cpp
src/gui/text/qtextengine_p.h
src/gui/text/qtextlayout.cpp
src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
src/plugins/platforms/windows/qwindowsfontengine.cpp
tests/auto/gui/text/qfontmetrics/tst_qfontmetrics.cpp
tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp