diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 13:45:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-06 13:45:10 (GMT) |
| commit | ccda3100c7a0487d314fb58ba315f06b1b40af9c (patch) | |
| tree | b43077f51f9791a6a5918163e2c0127b5cb5e3f2 | |
| parent | 440b48c8601e8a4bb31858c8c5521a0ab8961ef8 (diff) | |
| parent | a70d247d81d2f49faab522af5e4c2a815682c78a (diff) | |
| download | Qt-ccda3100c7a0487d314fb58ba315f06b1b40af9c.zip Qt-ccda3100c7a0487d314fb58ba315f06b1b40af9c.tar.gz Qt-ccda3100c7a0487d314fb58ba315f06b1b40af9c.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash for multiscript text in QTextEngine::boundingBox()
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index b826588..eaa80d3 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1648,7 +1648,7 @@ glyph_metrics_t QTextEngine::boundingBox(int from, int len) const } } - glyph_t glyph = glyphs.glyphs[logClusters[pos + ilen - 1]]; + glyph_t glyph = glyphs.glyphs[logClusters[ilen - 1]]; glyph_metrics_t gi = fe->boundingBox(glyph); if (gi.isValid()) gm.width -= qRound(gi.xoff - gi.x - gi.width); |