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/qwaylanddatadevicemanager.cpp | |
| parent | acd10cd393abe04a8fd6fe3ab14055e09c85bc15 (diff) | |
| parent | f7a386eeaec8e6314c1be7de5e14e9fe3847f9ba (diff) | |
Merge remote-tracking branch 'qt/5.6' into 5.7
Change-Id: I1efd16d6c5f939d61001376c3b010eae1927595b
Diffstat (limited to 'src/client/qwaylanddatadevicemanager.cpp')
| -rw-r--r-- | src/client/qwaylanddatadevicemanager.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/client/qwaylanddatadevicemanager.cpp b/src/client/qwaylanddatadevicemanager.cpp index 35d67307f..5c6f74157 100644 --- a/src/client/qwaylanddatadevicemanager.cpp +++ b/src/client/qwaylanddatadevicemanager.cpp @@ -46,6 +46,8 @@ #include <QtCore/QDebug> +#ifndef QT_NO_DRAGANDDROP + QT_BEGIN_NAMESPACE namespace QtWaylandClient { @@ -80,3 +82,5 @@ QWaylandDisplay *QWaylandDataDeviceManager::display() const } QT_END_NAMESPACE + +#endif // QT_NO_DRAGANDDROP |