--- a/src/gui/text/qtextengine_p.h Wed Jun 23 19:07:03 2010 +0300
+++ b/src/gui/text/qtextengine_p.h Tue Jul 06 15:10:48 2010 +0300
@@ -389,7 +389,7 @@
mutable uint gridfitted : 1;
uint hasTrailingSpaces : 1;
uint leadingIncluded : 1;
- QFixed height() const { return ascent + descent + 1
+ QFixed height() const { return (ascent + descent).ceil() + 1
+ (leadingIncluded? qMax(QFixed(),leading) : QFixed()); }
QFixed base() const { return ascent
+ (leadingIncluded ? qMax(QFixed(),leading) : QFixed()); }