diff options
| author | Jing Bai <jing.bai@digia.com> | 2013-01-15 19:04:10 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-21 11:15:20 +0100 |
| commit | 8c2284e811d6a1e5d1d5f0703f127e66800baf78 (patch) | |
| tree | 54636ac29412d8ceaacacdab831065808a468e00 /src/gui/text | |
| parent | 32426500bc9126de7322ce666e1fae4c0848731f (diff) | |
To support QT_NO_IM on Linux/Windows/Mac
Fix compilation issue when QT_NO_IM is defined.
Also fixed references in tests. But fixing
plugins/examples seem not necessary at this point.
Task-number: QTBUG-26109
Change-Id: I2067051951616012117efa6716640cbf198fdb2a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qtextcontrol.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp index 94f7e101a4..2fee68abb9 100644 --- a/src/gui/text/qtextcontrol.cpp +++ b/src/gui/text/qtextcontrol.cpp @@ -50,6 +50,7 @@ #include <qdebug.h> #include <qmime.h> #include <qdrag.h> +#include <qconfig.h> #include <qclipboard.h> #include <qmenu.h> #include <qstyle.h> @@ -3049,6 +3050,7 @@ void QTextControlPrivate::_q_copyLink() #endif } +#ifndef QT_NO_IM QInputContext *QTextControlPrivate::inputContext() { QInputContext *ctx = contextWidget->inputContext(); @@ -3056,6 +3058,7 @@ QInputContext *QTextControlPrivate::inputContext() ctx = contextWidget->parentWidget()->inputContext(); return ctx; } +#endif int QTextControl::hitTest(const QPointF &point, Qt::HitTestAccuracy accuracy) const { |