diff options
| author | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2017-01-13 19:05:32 +0900 |
|---|---|---|
| committer | Tasuku Suzuki <tasuku.suzuki@qt.io> | 2017-01-15 04:52:17 +0000 |
| commit | 52db6d23381269f0806377574d08e36aa05fc31a (patch) | |
| tree | 845c1bc2d83de99411f52408fedac1f4cd125ea6 | |
| parent | cab7cb98d5b9530a3c265cc2436dd7d157e43f66 (diff) | |
Fix build without feature.draganddrop
Change-Id: I4fff1a8d48483298eebecdc751fe76e80444bd99
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| -rw-r--r-- | src/client/client.pro | 12 | ||||
| -rw-r--r-- | src/compositor/compositor_api/compositor_api.pri | 9 |
2 files changed, 15 insertions, 6 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index 6904e905c..92d4309ff 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -39,7 +39,6 @@ SOURCES += qwaylandintegration.cpp \ qwaylandwindow.cpp \ qwaylandscreen.cpp \ qwaylandshmwindow.cpp \ - qwaylanddnd.cpp \ qwaylanddataoffer.cpp \ qwaylanddatadevicemanager.cpp \ qwaylanddatasource.cpp \ @@ -62,7 +61,6 @@ SOURCES += qwaylandintegration.cpp \ qwaylanddecorationplugin.cpp \ qwaylandwindowmanagerintegration.cpp \ qwaylandinputcontext.cpp \ - qwaylanddatadevice.cpp \ qwaylandshm.cpp \ qwaylandbuffer.cpp \ @@ -75,7 +73,6 @@ HEADERS += qwaylandintegration_p.h \ qwaylandinputdevice_p.h \ qwaylandbuffer_p.h \ qwaylandshmwindow_p.h \ - qwaylanddnd_p.h \ qwaylanddataoffer_p.h \ qwaylanddatadevicemanager_p.h \ qwaylanddatasource_p.h \ @@ -95,7 +92,6 @@ HEADERS += qwaylandintegration_p.h \ qwaylanddecorationplugin_p.h \ qwaylandwindowmanagerintegration_p.h \ qwaylandinputcontext_p.h \ - qwaylanddatadevice_p.h \ qwaylandshm_p.h \ qtwaylandclientglobal.h \ qtwaylandclientglobal_p.h \ @@ -122,6 +118,14 @@ qtConfig(cursor) { SOURCES += \ qwaylandcursor.cpp } +qtConfig(draganddrop) { + HEADERS += \ + qwaylanddnd_p.h \ + qwaylanddatadevice_p.h + SOURCES += \ + qwaylanddnd.cpp \ + qwaylanddatadevice.cpp +} CONFIG += generated_privates MODULE_PLUGIN_TYPES = \ diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri index 94cd737dc..35f57f808 100644 --- a/src/compositor/compositor_api/compositor_api.pri +++ b/src/compositor/compositor_api/compositor_api.pri @@ -19,7 +19,6 @@ HEADERS += \ compositor_api/qwaylandoutput.h \ compositor_api/qwaylandoutputmode.h \ compositor_api/qwaylandoutputmode_p.h \ - compositor_api/qwaylanddrag.h \ compositor_api/qwaylandbufferref.h \ compositor_api/qwaylanddestroylistener.h \ compositor_api/qwaylanddestroylistener_p.h \ @@ -40,7 +39,6 @@ SOURCES += \ compositor_api/qwaylandtouch.cpp \ compositor_api/qwaylandoutput.cpp \ compositor_api/qwaylandoutputmode.cpp \ - compositor_api/qwaylanddrag.cpp \ compositor_api/qwaylandbufferref.cpp \ compositor_api/qwaylanddestroylistener.cpp \ compositor_api/qwaylandview.cpp \ @@ -57,6 +55,13 @@ qtConfig(im) { QT += core-private +qtConfig(draganddrop) { + HEADERS += \ + compositor_api/qwaylanddrag.h + SOURCES += \ + compositor_api/qwaylanddrag.cpp +} + qtHaveModule(quick):qtConfig(opengl) { DEFINES += QT_WAYLAND_COMPOSITOR_QUICK |