diff options
| author | Bea Lam <bea.lam@nokia.com> | 2011-01-27 04:03:13 (GMT) |
|---|---|---|
| committer | Bea Lam <bea.lam@nokia.com> | 2011-01-27 04:03:13 (GMT) |
| commit | 05ba01a2519996a3dffaab2e498dc3d2a999dc45 (patch) | |
| tree | c478929354b59407bea92e885baf0eecb4e351c8 /src/gui/text/qtextdocument_p.cpp | |
| parent | f15778e60ba538b8715f6433a472ffe08a21d934 (diff) | |
| parent | 5c91e32a6238fd112a7282443214c8686cda51de (diff) | |
| download | Qt-05ba01a2519996a3dffaab2e498dc3d2a999dc45.zip Qt-05ba01a2519996a3dffaab2e498dc3d2a999dc45.tar.gz Qt-05ba01a2519996a3dffaab2e498dc3d2a999dc45.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Conflicts:
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativelistview.cpp
Diffstat (limited to 'src/gui/text/qtextdocument_p.cpp')
| -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) |