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/qwaylandsurface.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/qwaylandsurface.cpp')
| -rw-r--r-- | src/compositor/compositor_api/qwaylandsurface.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp index a576e0d6c..d6115e363 100644 --- a/src/compositor/compositor_api/qwaylandsurface.cpp +++ b/src/compositor/compositor_api/qwaylandsurface.cpp @@ -38,10 +38,13 @@ #include "qwaylandsurface.h" #include "qwaylandsurface_p.h" -#include "wayland_wrapper/qwldatadevice_p.h" -#include "wayland_wrapper/qwldatadevicemanager_p.h" #include "wayland_wrapper/qwlbuffermanager_p.h" #include "wayland_wrapper/qwlregion_p.h" +#include <QtWaylandCompositor/private/qtwaylandcompositorglobal_p.h> +#if QT_CONFIG(wayland_datadevice) +#include "wayland_wrapper/qwldatadevice_p.h" +#include "wayland_wrapper/qwldatadevicemanager_p.h" +#endif #include "extensions/qwlextendedsurface_p.h" #include "qwaylandinputmethodcontrol_p.h" @@ -682,6 +685,7 @@ QWaylandInputMethodControl *QWaylandSurface::inputMethodControl() const * this is done automatically when the surface receives keyboard focus, this * function is useful for updating clients which do not have keyboard focus. */ +#if QT_CONFIG(clipboard) void QWaylandSurface::updateSelection() { Q_D(QWaylandSurface); @@ -694,6 +698,7 @@ void QWaylandSurface::updateSelection() } } } +#endif /*! * Returns this QWaylandSurface's primary view. |