diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 10:40:10 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 10:40:10 +0100 |
| commit | c76a1716a3e51a9fac78377890ea0161a9658344 (patch) | |
| tree | 6d65c1f5c55f7b139aa2a3222847963edd379534 /src/client/qwaylandintegration_p.h | |
| parent | acd10cd393abe04a8fd6fe3ab14055e09c85bc15 (diff) | |
| parent | f7a386eeaec8e6314c1be7de5e14e9fe3847f9ba (diff) | |
Merge remote-tracking branch 'qt/5.6' into 5.7
Change-Id: I1efd16d6c5f939d61001376c3b010eae1927595b
Diffstat (limited to 'src/client/qwaylandintegration_p.h')
| -rw-r--r-- | src/client/qwaylandintegration_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h index 9a4990229..4f5e651d2 100644 --- a/src/client/qwaylandintegration_p.h +++ b/src/client/qwaylandintegration_p.h @@ -85,11 +85,10 @@ public: QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; - +#ifndef QT_NO_DRAGANDDROP QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; - QPlatformDrag *drag() const Q_DECL_OVERRIDE; - +#endif QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; @@ -126,8 +125,10 @@ private: QWaylandShellIntegration *createShellIntegration(const QString& interfaceName); QPlatformFontDatabase *mFontDb; +#ifndef QT_NO_DRAGANDDROP QPlatformClipboard *mClipboard; QPlatformDrag *mDrag; +#endif QWaylandDisplay *mDisplay; QPlatformNativeInterface *mNativeInterface; QScopedPointer<QPlatformInputContext> mInputContext; |