diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-08-29 12:15:31 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-08-29 12:15:31 +0200 |
| commit | 577b26b3178dfde697ca7ef969b180e9b8f4c08b (patch) | |
| tree | 3ff992c108fa9f5653cb907f2eec3f2977bf8bdd /src/gui/text/qtextengine.cpp | |
| parent | be62ece6c1ae8cbe19f1a445f82e55782fd22129 (diff) | |
| parent | d0c48efbae386dc88ea2313264e739715d9154b4 (diff) | |
Merge "Merge remote branch 'gerrit/master' into refactor" into refactor
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 58cccfcbf7..95a797439a 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -2093,7 +2093,8 @@ void QTextEngine::justify(const QScriptLine &line) } } - QFixed need = line.width - line.textWidth; + QFixed leading = leadingSpaceWidth(line); + QFixed need = line.width - line.textWidth - leading; if (need < 0) { // line overflows already! const_cast<QScriptLine &>(line).justified = true; |