diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:16:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-16 23:16:25 +0200 |
| commit | d148019f16e3c95916731e59e0324e7c470cc1fc (patch) | |
| tree | d9c0640c9055f24379468b8f55b3419f30a37c47 /src/gui/text/qtextengine.cpp | |
| parent | 8ceab12814a7437a01d917c83ec28fd6e81c459e (diff) | |
| parent | 6b9c57f8cd3df65702db327616913fa9d8172237 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/qnx/qqnxscreeneventhandler.cpp
Change-Id: I0af32ee55936d523cbd259b6fe82eb9c409f9074
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
| -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 7378b129a9..2f069a9abd 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -928,7 +928,7 @@ void QTextEngine::shapeLine(const QScriptLine &line) if (item == -1) return; - const int end = findItem(line.from + line.length - 1, item); + const int end = findItem(line.from + line.length + line.trailingSpaces - 1, item); for ( ; item <= end; ++item) { QScriptItem &si = layoutData->items[item]; if (si.analysis.flags == QScriptAnalysis::Tab) { |