diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 02:09:00 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-14 02:09:00 +1000 |
| commit | b9f9d811cfb71ab2983f25f3514da958e444de4b (patch) | |
| tree | 40b0f8571a98ffa6377adb075256e300652343e7 /src/gui/text/qtextcontrol.cpp | |
| parent | b205fca78bcede0b2eefc8c0b12fed040e77eff1 (diff) | |
| parent | 3d27a19ca009836b812b59c3359db1369d391181 (diff) | |
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
| -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 8c09b5bbed..a8bf763851 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -677,7 +677,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 |