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/client/qwaylanddataoffer.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/client/qwaylanddataoffer.cpp')
-rw-r--r-- | src/client/qwaylanddataoffer.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/client/qwaylanddataoffer.cpp b/src/client/qwaylanddataoffer.cpp index 56a18f007..2491c658b 100644 --- a/src/client/qwaylanddataoffer.cpp +++ b/src/client/qwaylanddataoffer.cpp @@ -47,8 +47,6 @@ #include <QtCore/QDebug> -#if QT_CONFIG(draganddrop) - QT_BEGIN_NAMESPACE namespace QtWaylandClient { @@ -183,5 +181,3 @@ int QWaylandMimeData::readData(int fd, QByteArray &data) const } QT_END_NAMESPACE - -#endif // draganddrop |