diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-02-28 15:33:14 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-02-28 15:33:14 (GMT) |
| commit | a220e7c51c701a81a675a46a76838260527fcc8e (patch) | |
| tree | a12130be836dba239c22dbd7d2af9db05d0a830c /src/gui/widgets | |
| parent | a27bce53b8d629c6eb41804476594abd0c9a482f (diff) | |
| parent | f691e052afbc6fef9f2954e7a7915be85a10f473 (diff) | |
| download | Qt-a220e7c51c701a81a675a46a76838260527fcc8e.zip Qt-a220e7c51c701a81a675a46a76838260527fcc8e.tar.gz Qt-a220e7c51c701a81a675a46a76838260527fcc8e.tar.bz2 | |
Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into merge-requests/1113
Conflicts:
doc/src/development/qmake-manual.qdoc
Diffstat (limited to 'src/gui/widgets')
| -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; } |