diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 12:48:57 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-11-10 12:50:29 +0100 |
| commit | 7321747048a99626acbe054d34c3d364bfa73bcc (patch) | |
| tree | 6f1905886dfed35dbba512b011bd39e18b1497ff /src/client/qwaylandintegration_p.h | |
| parent | 59965ed2277bb62e0ec38b149b570285828660fd (diff) | |
| parent | c76a1716a3e51a9fac78377890ea0161a9658344 (diff) | |
Merge remote-tracking branch 'qt/5.7' into 5.8
Change-Id: Ibfe6fe6ed983b537d55544883b7dc75e5cc3fc37
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 bd66f55a7..3b91313b5 100644 --- a/src/client/qwaylandintegration_p.h +++ b/src/client/qwaylandintegration_p.h @@ -87,11 +87,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; @@ -128,8 +127,10 @@ private: QWaylandShellIntegration *createShellIntegration(const QString& interfaceName); QScopedPointer<QPlatformFontDatabase> mFontDb; +#ifndef QT_NO_DRAGANDDROP QScopedPointer<QPlatformClipboard> mClipboard; QScopedPointer<QPlatformDrag> mDrag; +#endif QScopedPointer<QWaylandDisplay> mDisplay; QScopedPointer<QPlatformNativeInterface> mNativeInterface; QScopedPointer<QPlatformInputContext> mInputContext; |