diff options
| author | Tasuku Suzuki <stasuku@gmail.com> | 2012-11-23 02:47:45 +0900 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-26 18:47:36 +0100 |
| commit | e9e49c6157f7cfb84faeaab0438b0a30380f68f8 (patch) | |
| tree | 3bbf70c61e46b808db18a3258025da260fc2c13b /src/quick/items/qquicktextedit_p_p.h | |
| parent | cedaf867421f4c43a2da712f00e9626e64c8b250 (diff) | |
Enable module build with QT_NO_IM
Change-Id: I90f8ec7e6357db7b4038bb1646fe9d3835821556
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
Diffstat (limited to 'src/quick/items/qquicktextedit_p_p.h')
| -rw-r--r-- | src/quick/items/qquicktextedit_p_p.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/quick/items/qquicktextedit_p_p.h b/src/quick/items/qquicktextedit_p_p.h index b79f4701cf..106e8c00c0 100644 --- a/src/quick/items/qquicktextedit_p_p.h +++ b/src/quick/items/qquicktextedit_p_p.h @@ -78,7 +78,10 @@ public: , format(QQuickTextEdit::PlainText), wrapMode(QQuickTextEdit::NoWrap) , renderType(QQuickTextEdit::QtRendering) , contentDirection(Qt::LayoutDirectionAuto) - , mouseSelectionMode(QQuickTextEdit::SelectCharacters), inputMethodHints(Qt::ImhNone) + , mouseSelectionMode(QQuickTextEdit::SelectCharacters) +#ifndef QT_NO_IM + , inputMethodHints(Qt::ImhNone) +#endif , updateType(UpdatePaintNode) , documentDirty(true), dirty(false), richText(false), cursorVisible(false), cursorPending(false) , focusOnPress(true), persistentSelection(false), requireImplicitWidth(false) @@ -139,7 +142,9 @@ public: QQuickTextEdit::RenderType renderType; Qt::LayoutDirection contentDirection; QQuickTextEdit::SelectionMode mouseSelectionMode; +#ifndef QT_NO_IM Qt::InputMethodHints inputMethodHints; +#endif UpdateType updateType; bool documentDirty : 1; |