diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-25 14:53:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-25 14:53:28 (GMT) |
| commit | a67be14c2280065412f00133e8a1d2bed371eac9 (patch) | |
| tree | dc35f70a98e3e5701d33c9fb7c7304057f5d45df /src/gui | |
| parent | a0e0a9378d10db9c8ab3ba4d59f5c576ee4cbc40 (diff) | |
| parent | 34c297faca93e1286573b2a01127e4e7af00aff2 (diff) | |
| download | Qt-a67be14c2280065412f00133e8a1d2bed371eac9.zip Qt-a67be14c2280065412f00133e8a1d2bed371eac9.tar.gz Qt-a67be14c2280065412f00133e8a1d2bed371eac9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix cursor position adjustment when removing strings
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtextdocument_p.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp index 498a432..2172f74 100644 --- a/src/gui/text/qtextdocument_p.cpp +++ b/src/gui/text/qtextdocument_p.cpp @@ -663,7 +663,8 @@ void QTextDocumentPrivate::move(int pos, int to, int length, QTextUndoCommand::O Q_ASSERT(blocks.length() == fragments.length()); - finishEdit(); + if (!blockCursorAdjustment) + finishEdit(); } void QTextDocumentPrivate::remove(int pos, int length, QTextUndoCommand::Operation op) @@ -678,6 +679,7 @@ void QTextDocumentPrivate::remove(int pos, int length, QTextUndoCommand::Operati curs->changed = true; } } + finishEdit(); } void QTextDocumentPrivate::setCharFormat(int pos, int length, const QTextCharFormat &newFormat, FormatChangeMode mode) |