diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-16 13:53:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-12-16 13:53:16 (GMT) |
| commit | 5e3e9c5600e3089073990fd752e0eaa0336c6301 (patch) | |
| tree | e83ca7d4945faedbe657cfa35f3d4e908f3b089f | |
| parent | dc9c4a91b01a1f0d05f2a62d420721b6b2be987e (diff) | |
| parent | 870c4e7b9ce6143ae48f717265094d4f7e0d2434 (diff) | |
| download | Qt-5e3e9c5600e3089073990fd752e0eaa0336c6301.zip Qt-5e3e9c5600e3089073990fd752e0eaa0336c6301.tar.gz Qt-5e3e9c5600e3089073990fd752e0eaa0336c6301.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix crash in positionInLigature
| -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 ee2eef6..66773c6 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2805,7 +2805,7 @@ int QTextEngine::positionInLigature(const QScriptItem *si, int end, closestItem--; int pos = si->position + clusterStart + closestItem; // Jump to the next charStop - while (!attrs[pos].charStop && pos < end) + while (pos < end && !attrs[pos].charStop) pos++; return pos; } |