summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextcontrol.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-12 16:06:44 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-12 16:06:44 (GMT)
commitb205fca78bcede0b2eefc8c0b12fed040e77eff1 (patch)
treed2d836324535d5e9961be5e401dc47bde580750c /src/gui/text/qtextcontrol.cpp
parent2bb185d5e65be09b4e1f73eadd0ab87f9d6aecbb (diff)
parentbfa6ac28c57d62f9add7fa27f029eac7f3835fab (diff)
downloadQt-b205fca78bcede0b2eefc8c0b12fed040e77eff1.zip
Qt-b205fca78bcede0b2eefc8c0b12fed040e77eff1.tar.gz
Qt-b205fca78bcede0b2eefc8c0b12fed040e77eff1.tar.bz2
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.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 4396730..8c09b5b 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -1579,8 +1579,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);