diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-13 14:00:23 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-07-13 14:00:23 (GMT) |
| commit | 6827ea5e97c9f6540f0fae5236f89343c32f4cb8 (patch) | |
| tree | f3f367e2afb8069814ac292aa617e7d66eae42f3 /src | |
| parent | b9f33d6a4b3bfa161d75d40b2c8874135a08c861 (diff) | |
| parent | c0772f44fb1d53608ff629fc622103698c6d0ee5 (diff) | |
| download | Qt-6827ea5e97c9f6540f0fae5236f89343c32f4cb8.zip Qt-6827ea5e97c9f6540f0fae5236f89343c32f4cb8.tar.gz Qt-6827ea5e97c9f6540f0fae5236f89343c32f4cb8.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 potential crash when clicking in a text edit
Diffstat (limited to 'src')
| -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 648f5c0..6c13eae 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2789,6 +2789,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) { |