diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 04:31:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-13 04:31:32 (GMT) |
| commit | 203b5edc04143edce0335c5e62de409c64df4c07 (patch) | |
| tree | f71a1148267a082b712628ab3219b7a155c8570f /src | |
| parent | f6d9a717946422d910ec9e680197617eb706410c (diff) | |
| parent | f69e465e15930ef02dceba7175eed6f3f1df070e (diff) | |
| download | Qt-203b5edc04143edce0335c5e62de409c64df4c07.zip Qt-203b5edc04143edce0335c5e62de409c64df4c07.tar.gz Qt-203b5edc04143edce0335c5e62de409c64df4c07.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:
Make TextEdit word selection more natural.
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 cf8e313..88e0573 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -676,7 +676,7 @@ void QTextControlPrivate::extendWordwiseSelection(int suggestedNewPosition, qrea const qreal wordEndX = line.cursorToX(curs.position() - blockPos) + blockCoordinates.x(); - if (mouseXPosition < wordStartX || mouseXPosition > wordEndX) + if (!wordSelectionEnabled && (mouseXPosition < wordStartX || mouseXPosition > wordEndX)) return; // keep the already selected word even when moving to the left |