diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-04 01:33:05 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-04 01:33:05 (GMT) |
| commit | c4495832d6c680af3116374471831a02b72a852e (patch) | |
| tree | 575d4fd3d84c08290caa56364787ef80321465d8 /src/gui | |
| parent | 1bff371ba56f456207b8e4e837d2b57fe72507e2 (diff) | |
| parent | f9eac4edbd06adef7569ca99043da57129c96812 (diff) | |
| download | Qt-c4495832d6c680af3116374471831a02b72a852e.zip Qt-c4495832d6c680af3116374471831a02b72a852e.tar.gz Qt-c4495832d6c680af3116374471831a02b72a852e.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:
Move cursorDelegate with the mouse selection of read only text input.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 84b620f..9081ab7 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1664,8 +1664,10 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons #endif //QT_NO_IM } else { //emit q->visibilityRequest(QRectF(mousePos, QSizeF(1, 1))); - if (cursor.position() != oldCursorPos) + if (cursor.position() != oldCursorPos) { emit q->cursorPositionChanged(); + emit q->microFocusChanged(); + } } selectionChanged(true); repaintOldAndNewSelection(oldSelection); @@ -1709,8 +1711,10 @@ void QTextControlPrivate::mouseReleaseEvent(QEvent *e, Qt::MouseButton button, c repaintOldAndNewSelection(oldSelection); - if (cursor.position() != oldCursorPos) + if (cursor.position() != oldCursorPos) { emit q->cursorPositionChanged(); + emit q->microFocusChanged(); + } if (interactionFlags & Qt::LinksAccessibleByMouse) { if (!(button & Qt::LeftButton)) |