diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-16 13:59:20 +0100 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-23 13:37:00 +0000 |
commit | 1e1785c8d2b077c34a8ca1d4f93e5a75b269eac8 (patch) | |
tree | a4264362c3ef1b070da05ab46edab612d53501dc /src/compositor/compositor_api/qwaylanddrag.cpp | |
parent | dfcda81c5b13ad15517a37bcc45f3bf5f550466c (diff) |
Clean up draganddrop and clipboard features
Don't assume that no-draganddrop implies no-clipboard. Introduce
a new private feature wayland-datadevice which contains the
common functionality. This feature cannot be controlled independently,
but is automatically disabled when both clipboard and draganddrop are
disabled.
Change-Id: I6aac09c7ee524e3b11f0a1caa4a6c62fc3f1d10f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Johan Helsing <johan.helsing@qt.io>
Diffstat (limited to 'src/compositor/compositor_api/qwaylanddrag.cpp')
-rw-r--r-- | src/compositor/compositor_api/qwaylanddrag.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/compositor/compositor_api/qwaylanddrag.cpp b/src/compositor/compositor_api/qwaylanddrag.cpp index 3c3d9ce52..cd7cef843 100644 --- a/src/compositor/compositor_api/qwaylanddrag.cpp +++ b/src/compositor/compositor_api/qwaylanddrag.cpp @@ -38,9 +38,13 @@ #include <private/qobject_p.h> -#include "qwldatadevice_p.h" #include "qwaylandview.h" #include <QtWaylandCompositor/private/qwaylandseat_p.h> +#include <QtWaylandCompositor/private/qtwaylandcompositorglobal_p.h> + +#if QT_CONFIG(wayland_datadevice) +#include "qwldatadevice_p.h" +#endif QT_BEGIN_NAMESPACE |