diff options
| author | axis <qt-info@nokia.com> | 2009-05-11 06:30:34 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-11 06:30:34 (GMT) |
| commit | 804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867 (patch) | |
| tree | 0258fb5f685ccaa710f8ea8ec9da9b6aa9f91d35 /src/gui/widgets/qplaintextedit.cpp | |
| parent | efb3e7288eec748db11c35de87239a1eff4d457c (diff) | |
| parent | 842ba1b3878c2973b24936b18a7ee55bdd980be6 (diff) | |
| download | Qt-804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867.zip Qt-804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867.tar.gz Qt-804a0ff4ad8c27ece2d403b8d9a4f6f65cdcf867.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
tests/auto/qtemporaryfile/qtemporaryfile.pro
Diffstat (limited to 'src/gui/widgets/qplaintextedit.cpp')
| -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 2e9201d..e563fa1 100644 --- a/src/gui/widgets/qplaintextedit.cpp +++ b/src/gui/widgets/qplaintextedit.cpp @@ -624,7 +624,7 @@ void QPlainTextEditPrivate::setTopBlock(int blockNumber, int lineNumber, int dx) if (viewport->updatesEnabled() && viewport->isVisible()) { int dy = 0; - if (doc->findBlockByLineNumber(control->topBlock).isValid()) { + if (doc->findBlockByNumber(control->topBlock).isValid()) { dy = (int)(-q->blockBoundingGeometry(block).y()) + verticalOffset() - verticalOffset(blockNumber, lineNumber); } |