diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-25 12:12:45 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-25 12:19:40 +0100 |
| commit | 44e3a9d321190f2958e1a1bdfa7f840e56355279 (patch) | |
| tree | 4d167e9d0cfcb59eb6e2dd5ed4f55981627e9339 /src/compositor/compositor_api/compositor_api.pri | |
| parent | e26696524ceb58f4fe0cb7202d873240b6a9478d (diff) | |
| parent | f72d63866d3f5820865fcd309b649dc9932518ee (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
.qmake.conf
examples/wayland/custom-extension/client-common/main.cpp
src/client/qwaylandwlshellintegration_p.h
src/client/qwaylandxdgshellintegration_p.h
src/compositor/compositor_api/qwaylandquickoutput.h
src/plugins/shellintegration/ivi-shell/qwaylandivisurface_p.h
Change-Id: Ic78c610ddf102b0a185294f625bbfcb9238b0f3c
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 |