diff options
| author | Liang Qi <liang.qi@nokia.com> | 2011-07-14 09:15:55 (GMT) |
|---|---|---|
| committer | Liang Qi <liang.qi@nokia.com> | 2011-07-14 09:15:55 (GMT) |
| commit | 88d6bf04e01f4f006ed2708851e925d59012d591 (patch) | |
| tree | 0fbd062191d966b7d2d1cc59dcafb9631e02b71f /src/gui/text | |
| parent | 80b91ac5f579b5cc310366fb0ea4aa4c813c04bf (diff) | |
| parent | 6827ea5e97c9f6540f0fae5236f89343c32f4cb8 (diff) | |
| download | Qt-88d6bf04e01f4f006ed2708851e925d59012d591.zip Qt-88d6bf04e01f4f006ed2708851e925d59012d591.tar.gz Qt-88d6bf04e01f4f006ed2708851e925d59012d591.tar.bz2 | |
Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7
Conflicts:
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index c900918..31d7e8a 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2890,6 +2890,7 @@ int QTextEngine::positionInLigature(const QScriptItem *si, int end, } const HB_CharAttributes *attrs = attributes(); + logClusters = this->logClusters(si); clusterLength = getClusterLength(logClusters, attrs, 0, end, glyph_pos, &clusterStart); if (clusterLength) { |