diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-23 14:14:26 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-02-23 14:14:26 (GMT) |
| commit | bf4ee2192f59d65423f5157c62c7344165fd3088 (patch) | |
| tree | 0bfbc840f2356c40b7c41909e7a7f9fb3001382d /src/gui | |
| parent | bf2f68704ca62fa5ac21c0559dc896f02cf4775d (diff) | |
| parent | a2c10e7f58b1031a94c7a31ccf34cfd34e65f515 (diff) | |
| download | Qt-bf4ee2192f59d65423f5157c62c7344165fd3088.zip Qt-bf4ee2192f59d65423f5157c62c7344165fd3088.tar.gz Qt-bf4ee2192f59d65423f5157c62c7344165fd3088.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix QPlainTextEdit corruption/crash with scrolling
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qplaintextedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp index d3af9e1..7435691 100644 --- a/src/gui/widgets/qplaintextedit.cpp +++ b/src/gui/widgets/qplaintextedit.cpp @@ -967,7 +967,7 @@ void QPlainTextEditPrivate::_q_adjustScrollbars() ++lineNumber; } if (lineNumber < layoutLineCount) - visibleFromBottom += (layoutLineCount - lineNumber - 1); + visibleFromBottom += (layoutLineCount - lineNumber); break; } |