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/qwaylandinputmethodcontrol.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/qwaylandinputmethodcontrol.h')
-rw-r--r-- | src/compositor/compositor_api/qwaylandinputmethodcontrol.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandinputmethodcontrol.h b/src/compositor/compositor_api/qwaylandinputmethodcontrol.h index ab894c9c5..af02e1ae5 100644 --- a/src/compositor/compositor_api/qwaylandinputmethodcontrol.h +++ b/src/compositor/compositor_api/qwaylandinputmethodcontrol.h @@ -37,6 +37,7 @@ #ifndef QWAYLANDINPUTMETHODCONTROL_H #define QWAYLANDINPUTMETHODCONTROL_H +#include <QtGui/qtguiglobal.h> #include <QObject> QT_BEGIN_NAMESPACE @@ -56,7 +57,7 @@ class QWaylandInputMethodControl : public QObject public: explicit QWaylandInputMethodControl(QWaylandSurface *surface); -#ifndef QT_NO_IM +#if QT_CONFIG(im) QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; #endif @@ -69,7 +70,7 @@ public: Q_SIGNALS: void enabledChanged(bool enabled); -#ifndef QT_NO_IM +#if QT_CONFIG(im) void updateInputMethod(Qt::InputMethodQueries queries); #endif |