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/qwaylanddnd_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/qwaylanddnd_p.h')
| -rw-r--r-- | src/client/qwaylanddnd_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/qwaylanddnd_p.h b/src/client/qwaylanddnd_p.h index 2ff00b9ff..464b9837b 100644 --- a/src/client/qwaylanddnd_p.h +++ b/src/client/qwaylanddnd_p.h @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { class QWaylandDisplay; - +#ifndef QT_NO_DRAGANDDROP class Q_WAYLAND_CLIENT_EXPORT QWaylandDrag : public QBasicDrag { public: @@ -88,7 +88,7 @@ protected: private: QWaylandDisplay *m_display; }; - +#endif } QT_END_NAMESPACE |