aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/items/qquickitem.h
diff options
context:
space:
mode:
authorTasuku Suzuki <stasuku@gmail.com>2012-11-23 02:47:45 +0900
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-26 18:47:36 +0100
commite9e49c6157f7cfb84faeaab0438b0a30380f68f8 (patch)
tree3bbf70c61e46b808db18a3258025da260fc2c13b /src/quick/items/qquickitem.h
parentcedaf867421f4c43a2da712f00e9626e64c8b250 (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/qquickitem.h')
-rw-r--r--src/quick/items/qquickitem.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index af79a08b1c..a41aa7f27f 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -156,7 +156,9 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus
public:
enum Flag {
ItemClipsChildrenToShape = 0x01,
+#ifndef QT_NO_IM
ItemAcceptsInputMethod = 0x02,
+#endif
ItemIsFocusScope = 0x04,
ItemHasContents = 0x08,
ItemAcceptsDrops = 0x10
@@ -321,7 +323,9 @@ public:
Q_INVOKABLE void forceActiveFocus();
Q_INVOKABLE QQuickItem *childAt(qreal x, qreal y) const;
+#ifndef QT_NO_IM
virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const;
+#endif
struct UpdatePaintNodeData {
QSGTransformNode *transformNode;
@@ -371,7 +375,9 @@ protected:
bool isComponentComplete() const;
virtual void itemChange(ItemChange, const ItemChangeData &);
+#ifndef QT_NO_IM
void updateInputMethod(Qt::InputMethodQueries queries = Qt::ImQueryInput);
+#endif
bool widthValid() const; // ### better name?
bool heightValid() const; // ### better name?
@@ -382,7 +388,9 @@ protected:
virtual void keyPressEvent(QKeyEvent *event);
virtual void keyReleaseEvent(QKeyEvent *event);
+#ifndef QT_NO_IM
virtual void inputMethodEvent(QInputMethodEvent *);
+#endif
virtual void focusInEvent(QFocusEvent *);
virtual void focusOutEvent(QFocusEvent *);
virtual void mousePressEvent(QMouseEvent *event);