diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:44:33 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:44:34 +0100 |
| commit | ee58fc0edc94d18c2ab6d30f1836b23606ab2195 (patch) | |
| tree | ab6a8ff67ebee6de5ad36f45970376790ea5c30d /src/compositor/compositor_api/compositor_api.pri | |
| parent | 4060e1416d0340b6c31ee193db6be3ce8083a4cd (diff) | |
| parent | 44e3a9d321190f2958e1a1bdfa7f840e56355279 (diff) | |
Merge dev into 5.9
Change-Id: I560f73aa89f2b833a405861bef510aad8fbd9a07
Diffstat (limited to 'src/compositor/compositor_api/compositor_api.pri')
| -rw-r--r-- | src/compositor/compositor_api/compositor_api.pri | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/compositor/compositor_api/compositor_api.pri b/src/compositor/compositor_api/compositor_api.pri index 1e9284c62..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 \ @@ -27,8 +26,6 @@ HEADERS += \ compositor_api/qwaylandview_p.h \ compositor_api/qwaylandresource.h \ compositor_api/qwaylandsurfacegrabber.h \ - compositor_api/qwaylandinputmethodcontrol.h \ - compositor_api/qwaylandinputmethodcontrol_p.h \ compositor_api/qwaylandoutputmode_p.h SOURCES += \ @@ -42,16 +39,29 @@ 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 \ compositor_api/qwaylandresource.cpp \ - compositor_api/qwaylandsurfacegrabber.cpp \ - compositor_api/qwaylandinputmethodcontrol.cpp + compositor_api/qwaylandsurfacegrabber.cpp + +qtConfig(im) { + HEADERS += \ + compositor_api/qwaylandinputmethodcontrol.h \ + compositor_api/qwaylandinputmethodcontrol_p.h + SOURCES += \ + compositor_api/qwaylandinputmethodcontrol.cpp +} QT += core-private +qtConfig(draganddrop) { + HEADERS += \ + compositor_api/qwaylanddrag.h + SOURCES += \ + compositor_api/qwaylanddrag.cpp +} + qtHaveModule(quick):qtConfig(opengl) { DEFINES += QT_WAYLAND_COMPOSITOR_QUICK |