diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2010-03-25 06:00:55 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2010-03-25 06:00:55 (GMT) |
| commit | 32b5fdfabf3158c7b03d1011f4551a45371b27e3 (patch) | |
| tree | 0339732e5529917a52eb7ff86e6209c262ab7032 /src/gui/text/qtextlayout.cpp | |
| parent | d373f8b8ee0a5841bcdb264b0b01b262c15e7f89 (diff) | |
| parent | a4f0b174dd7d6eb837915d9d99b2067b8cb00187 (diff) | |
| download | Qt-32b5fdfabf3158c7b03d1011f4551a45371b27e3.zip Qt-32b5fdfabf3158c7b03d1011f4551a45371b27e3.tar.gz Qt-32b5fdfabf3158c7b03d1011f4551a45371b27e3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.7
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
Diffstat (limited to 'src/gui/text/qtextlayout.cpp')
| -rw-r--r-- | src/gui/text/qtextlayout.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qtextlayout.cpp b/src/gui/text/qtextlayout.cpp index 2fc5d1a..312d135 100644 --- a/src/gui/text/qtextlayout.cpp +++ b/src/gui/text/qtextlayout.cpp @@ -1702,9 +1702,9 @@ namespace { if (currentPosition <= 0) return; - glyph_metrics_t gi = fontEngine->boundingBox(currentGlyph()); - if (gi.isValid()) - rightBearing = qMin(QFixed(), gi.xoff - gi.x - gi.width); + qreal rb; + fontEngine->getGlyphBearings(currentGlyph(), 0, &rb); + rightBearing = qMin(QFixed(), QFixed::fromReal(rb)); } inline void resetRightBearing() |