diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 06:55:47 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-12 06:55:47 (GMT) |
| commit | 959e9227371efc58c76f6a6c265744d9c3227a4b (patch) | |
| tree | 77456ee1223eefd4149c1cd5d98e84fb2939d7a0 /src | |
| parent | a4e406277bc6af457d26134d654f17df553330fc (diff) | |
| parent | 88492fcea5d5c8dd6a8e1c2458a6a2b8747e84c7 (diff) | |
| download | Qt-959e9227371efc58c76f6a6c265744d9c3227a4b.zip Qt-959e9227371efc58c76f6a6c265744d9c3227a4b.tar.gz Qt-959e9227371efc58c76f6a6c265744d9c3227a4b.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:
Ensure the TextEdit cursor delegate is repositioned on mouse events.
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 3fd3ab5..cf8e313 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1578,8 +1578,10 @@ void QTextControlPrivate::mousePressEvent(QEvent *e, Qt::MouseButton button, con emit q->cursorPositionChanged(); _q_updateCurrentCharFormatAndSelection(); } else { - if (cursor.position() != oldCursorPos) + if (cursor.position() != oldCursorPos) { emit q->cursorPositionChanged(); + emit q->microFocusChanged(); + } selectionChanged(); } repaintOldAndNewSelection(oldSelection); |