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/client/client.pro | |
parent | e26696524ceb58f4fe0cb7202d873240b6a9478d (diff) | |
parent | f72d63866d3f5820865fcd309b649dc9932518ee (diff) | |
download | qtwayland-44e3a9d321190f2958e1a1bdfa7f840e56355279.tar.gz |
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/client/client.pro')
-rw-r--r-- | src/client/client.pro | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index 7d602086..824c715b 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -18,7 +18,7 @@ CONFIG += link_pkgconfig wayland-scanner qtConfig(xkbcommon-evdev): \ QMAKE_USE_PRIVATE += xkbcommon_evdev -QMAKE_USE += wayland-client wayland-cursor +QMAKE_USE += wayland-client INCLUDEPATH += $$PWD/../shared @@ -36,13 +36,10 @@ SOURCES += qwaylandintegration.cpp \ qwaylandnativeinterface.cpp \ qwaylandshmbackingstore.cpp \ qwaylandinputdevice.cpp \ - qwaylandcursor.cpp \ qwaylanddisplay.cpp \ qwaylandwindow.cpp \ qwaylandscreen.cpp \ qwaylandshmwindow.cpp \ - qwaylandclipboard.cpp \ - qwaylanddnd.cpp \ qwaylanddataoffer.cpp \ qwaylanddatadevicemanager.cpp \ qwaylanddatasource.cpp \ @@ -67,13 +64,11 @@ SOURCES += qwaylandintegration.cpp \ qwaylanddecorationplugin.cpp \ qwaylandwindowmanagerintegration.cpp \ qwaylandinputcontext.cpp \ - qwaylanddatadevice.cpp \ qwaylandshm.cpp \ qwaylandbuffer.cpp \ HEADERS += qwaylandintegration_p.h \ qwaylandnativeinterface_p.h \ - qwaylandcursor_p.h \ qwaylanddisplay_p.h \ qwaylandwindow_p.h \ qwaylandscreen_p.h \ @@ -81,8 +76,6 @@ HEADERS += qwaylandintegration_p.h \ qwaylandinputdevice_p.h \ qwaylandbuffer_p.h \ qwaylandshmwindow_p.h \ - qwaylandclipboard_p.h \ - qwaylanddnd_p.h \ qwaylanddataoffer_p.h \ qwaylanddatadevicemanager_p.h \ qwaylanddatasource_p.h \ @@ -104,7 +97,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 \ @@ -113,11 +105,33 @@ HEADERS += qwaylandintegration_p.h \ ../shared/qwaylandxkb_p.h \ ../shared/qwaylandsharedmemoryformathelper_p.h \ +qtConfig(clipboard) { + HEADERS += qwaylandclipboard_p.h + SOURCES += qwaylandclipboard.cpp +} + include(hardwareintegration/hardwareintegration.pri) include(shellintegration/shellintegration.pri) include(inputdeviceintegration/inputdeviceintegration.pri) include(global/global.pri) +qtConfig(cursor) { + QMAKE_USE += wayland-cursor + + HEADERS += \ + qwaylandcursor_p.h + SOURCES += \ + qwaylandcursor.cpp +} +qtConfig(draganddrop) { + HEADERS += \ + qwaylanddnd_p.h \ + qwaylanddatadevice_p.h + SOURCES += \ + qwaylanddnd.cpp \ + qwaylanddatadevice.cpp +} + CONFIG += generated_privates MODULE_PLUGIN_TYPES = \ wayland-graphics-integration-client \ |