diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-02 14:43:11 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-02 14:43:11 (GMT) |
| commit | 2ed925753cb194970712330edca4da8e91fa8f28 (patch) | |
| tree | d06c72229e1afeac25989a5409b052fa5cefeda6 /src/gui/text | |
| parent | cf800465369fb1ef84e8bddbbbfa7128d95afd27 (diff) | |
| parent | 5e0bdffd92cbff2a9eb551f77850a24bf2a2116a (diff) | |
| download | Qt-2ed925753cb194970712330edca4da8e91fa8f28.zip Qt-2ed925753cb194970712330edca4da8e91fa8f28.tar.gz Qt-2ed925753cb194970712330edca4da8e91fa8f28.tar.bz2 | |
Merge branch 'feature' into 4.6
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index ee8b751..3f6545c 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1619,9 +1619,11 @@ void QTextControlPrivate::mouseMoveEvent(Qt::MouseButtons buttons, const QPointF if (cursor.position() != oldCursorPos) emit q->cursorPositionChanged(); _q_updateCurrentCharFormatAndSelection(); +#ifndef QT_NO_IM if (QInputContext *ic = inputContext()) { ic->update(); } +#endif //QT_NO_IM } else { //emit q->visibilityRequest(QRectF(mousePos, QSizeF(1, 1))); if (cursor.position() != oldCursorPos) |