diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 16:37:37 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 16:37:37 (GMT) |
| commit | d31089f55c8a17d715ee22d420c57eea708a0652 (patch) | |
| tree | a2896abaf747470d64092a20f344bbcf16b76031 /src | |
| parent | 2c8845bed37a9d81a21078bf95f8d6d2e6e8c0e8 (diff) | |
| parent | e5a911351ae11376e6d86d70ddacd4016450ed6b (diff) | |
| download | Qt-d31089f55c8a17d715ee22d420c57eea708a0652.zip Qt-d31089f55c8a17d715ee22d420c57eea708a0652.tar.gz Qt-d31089f55c8a17d715ee22d420c57eea708a0652.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix text selection with shift-click.
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 6babca1..1a81394 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1551,7 +1551,7 @@ void QTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton button, con extendBlockwiseSelection(cursorPos); else if (selectedWordOnDoubleClick.hasSelection()) extendWordwiseSelection(cursorPos, pos.x()); - else if (wordSelectionEnabled) + else if (!wordSelectionEnabled) setCursorPosition(cursorPos, QTextCursor::KeepAnchor); } else { |