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/client/qwaylandintegration_p.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/client/qwaylandintegration_p.h')
| -rw-r--r-- | src/client/qwaylandintegration_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h index e30a10ea0..39bd812d9 100644 --- a/src/client/qwaylandintegration_p.h +++ b/src/client/qwaylandintegration_p.h @@ -75,7 +75,7 @@ public: bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; -#ifndef QT_NO_OPENGL +#if QT_CONFIG(opengl) QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; #endif QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; @@ -86,7 +86,7 @@ public: QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; QPlatformDrag *drag() const Q_DECL_OVERRIDE; #endif @@ -94,7 +94,7 @@ public: QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; #endif @@ -126,14 +126,14 @@ private: QWaylandShellIntegration *createShellIntegration(const QString& interfaceName); QScopedPointer<QPlatformFontDatabase> mFontDb; -#ifndef QT_NO_DRAGANDDROP +#if QT_CONFIG(draganddrop) QScopedPointer<QPlatformClipboard> mClipboard; QScopedPointer<QPlatformDrag> mDrag; #endif QScopedPointer<QWaylandDisplay> mDisplay; QScopedPointer<QPlatformNativeInterface> mNativeInterface; QScopedPointer<QPlatformInputContext> mInputContext; -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QScopedPointer<QPlatformAccessibility> mAccessibility; #endif bool mClientBufferIntegrationInitialized; |