diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-11-16 11:10:14 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-11-23 08:42:11 +0000 |
| commit | 893fd8540f2a2182a5e28fc88d59310f0aff8afe (patch) | |
| tree | b3584b572a834ae1d18f88320a063fec0a92b066 /src/compositor/compositor_api/qwaylandquickitem.h | |
| parent | 2333c58fff009435503c3b7ef3d86569227056eb (diff) | |
Use new feature system, part 2
Convert all uses of QT_NO_FOO to proper QT_CONFIG(foo) checks.
Change-Id: Id0f0b3325c246567a43d6b2d71b0d69e5535e648
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylandquickitem.h')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandquickitem.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/compositor_api/qwaylandquickitem.h b/src/compositor/compositor_api/qwaylandquickitem.h index 524813c4c..87d10b024 100644 --- a/src/compositor/compositor_api/qwaylandquickitem.h +++ b/src/compositor/compositor_api/qwaylandquickitem.h @@ -102,7 +102,7 @@ public: bool sizeFollowsSurface() const; void setSizeFollowsSurface(bool sizeFollowsSurface); -#ifndef QT_NO_IM +#if QT_CONFIG(im) QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; #endif @@ -135,7 +135,7 @@ protected: void touchEvent(QTouchEvent *event) Q_DECL_OVERRIDE; -#ifndef QT_NO_IM +#if QT_CONFIG(im) void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; #endif @@ -157,7 +157,7 @@ private Q_SLOTS: void handleSubsurfaceAdded(QWaylandSurface *childSurface); void handleSubsurfacePosition(const QPoint &pos); void handleDragStarted(QWaylandDrag *drag); -#ifndef QT_NO_IM +#if QT_CONFIG(im) void updateInputMethod(Qt::InputMethodQueries queries); #endif |