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/qquicktextinput_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/qquicktextinput_p.h')
| -rw-r--r-- | src/quick/items/qquicktextinput_p.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/quick/items/qquicktextinput_p.h b/src/quick/items/qquicktextinput_p.h index d3559f6605..419ec0e509 100644 --- a/src/quick/items/qquicktextinput_p.h +++ b/src/quick/items/qquicktextinput_p.h @@ -88,7 +88,9 @@ class Q_AUTOTEST_EXPORT QQuickTextInput : public QQuickImplicitSizeItem Q_PROPERTY(QValidator* validator READ validator WRITE setValidator NOTIFY validatorChanged) #endif Q_PROPERTY(QString inputMask READ inputMask WRITE setInputMask NOTIFY inputMaskChanged) +#ifndef QT_NO_IM Q_PROPERTY(Qt::InputMethodHints inputMethodHints READ inputMethodHints WRITE setInputMethodHints NOTIFY inputMethodHintsChanged) +#endif Q_PROPERTY(bool acceptableInput READ hasAcceptableInput NOTIFY acceptableInputChanged) Q_PROPERTY(EchoMode echoMode READ echoMode WRITE setEchoMode NOTIFY echoModeChanged) @@ -104,7 +106,9 @@ class Q_AUTOTEST_EXPORT QQuickTextInput : public QQuickImplicitSizeItem #endif Q_PROPERTY(bool canUndo READ canUndo NOTIFY canUndoChanged) Q_PROPERTY(bool canRedo READ canRedo NOTIFY canRedoChanged) +#ifndef QT_NO_IM Q_PROPERTY(bool inputMethodComposing READ isInputMethodComposing NOTIFY inputMethodComposingChanged) +#endif Q_PROPERTY(qreal contentWidth READ contentWidth NOTIFY contentSizeChanged) Q_PROPERTY(qreal contentHeight READ contentHeight NOTIFY contentSizeChanged) Q_PROPERTY(RenderType renderType READ renderType WRITE setRenderType NOTIFY renderTypeChanged) @@ -247,7 +251,9 @@ public: bool hasAcceptableInput() const; +#ifndef QT_NO_IM QVariant inputMethodQuery(Qt::InputMethodQuery property) const; +#endif QRectF boundingRect() const; QRectF clipRect() const; @@ -259,10 +265,12 @@ public: bool canUndo() const; bool canRedo() const; +#ifndef QT_NO_IM bool isInputMethodComposing() const; Qt::InputMethodHints inputMethodHints() const; void setInputMethodHints(Qt::InputMethodHints hints); +#endif Q_INVOKABLE QString getText(int start, int end) const; @@ -302,10 +310,14 @@ Q_SIGNALS: void canPasteChanged(); void canUndoChanged(); void canRedoChanged(); +#ifndef QT_NO_IM void inputMethodComposingChanged(); +#endif void effectiveHorizontalAlignmentChanged(); void contentSizeChanged(); +#ifndef QT_NO_IM void inputMethodHintsChanged(); +#endif void renderTypeChanged(); protected: @@ -317,7 +329,9 @@ protected: void mouseReleaseEvent(QMouseEvent *event); void mouseDoubleClickEvent(QMouseEvent *event); void keyPressEvent(QKeyEvent* ev); +#ifndef QT_NO_IM void inputMethodEvent(QInputMethodEvent *); +#endif void mouseUngrabEvent(); bool event(QEvent *e); void focusInEvent(QFocusEvent *event); |