diff options
| author | Martin Jones <martin.jones@nokia.com> | 2011-03-08 09:03:53 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2011-03-08 09:03:53 (GMT) |
| commit | bd528156fe69188957f00bd33fa96b9dd6688820 (patch) | |
| tree | 57e5328fbbd511005cf32ea1b33959bee1f84a88 /src | |
| parent | f47f01fd34d08f6152c9053c0d6928fc359aa0f9 (diff) | |
| parent | 6a0221d77ec768273a093268a86e30e82fcab934 (diff) | |
| download | Qt-bd528156fe69188957f00bd33fa96b9dd6688820.zip Qt-bd528156fe69188957f00bd33fa96b9dd6688820.tar.gz Qt-bd528156fe69188957f00bd33fa96b9dd6688820.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
Conflicts:
tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
Change-Id: Iddfc48e643a7f043afa1c5d5f1777f645a39548e
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index f4054d3..f5da079 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -284,7 +284,7 @@ bool QTextControlPrivate::cursorMoveKeyEvent(QKeyEvent *e) if (cursor.position() != oldCursorPos) emit q->cursorPositionChanged(); emit q->microFocusChanged(); - } else if (ignoreNavigationEvents && isNavigationEvent) { + } else if (ignoreNavigationEvents && isNavigationEvent && oldSelection.anchor() == cursor.anchor()) { return false; } |