diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-05 02:05:56 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-05 02:05:56 +1000 |
| commit | ca83e2df556e4e3db361ffd09696ef6c94d7324e (patch) | |
| tree | 237edade3dc9e5fcdf623f9e7882805f0ea86c14 /src/gui/text/qtextcontrol.cpp | |
| parent | 8ddf96a15f707001755d5b934f3f900b825b5887 (diff) | |
| parent | 57530dab8043c67b1356fb764fc83f6ef00dfdc1 (diff) | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'src/gui/text/qtextcontrol.cpp')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 46f1d6206f..d121e038bc 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -1650,8 +1650,10 @@ void QTextControlPrivate::mouseMoveEvent(QEvent *e, Qt::MouseButton button, cons emit q->cursorPositionChanged(); _q_updateCurrentCharFormatAndSelection(); #ifndef QT_NO_IM - if (QInputContext *ic = inputContext()) { - ic->update(); + if (contextWidget) { + if (QInputContext *ic = inputContext()) { + ic->update(); + } } #endif //QT_NO_IM } else { |