diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-07-02 14:42:45 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-29 13:09:05 +0200 |
| commit | 50b9addb08b04f365d0f2d3439291523fa858e8d (patch) | |
| tree | f26bbba26d5468ec40099a61994ee9b78a03261e /src/compositor/.prev_CMakeLists.txt | |
| parent | 48e30da0902ba0775a04745d091abea49742fb89 (diff) | |
Adapt to recent qtbase changes and update dependencies
- moving linuxaccessibility/xkbcommon/eglsupport/glxsupport to QtGui
- event refactoring
Task-number: QTBUG-83255
Change-Id: Ic82ee6ef5652413781468edb58c601ee7dce2e3b
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/compositor/.prev_CMakeLists.txt')
| -rw-r--r-- | src/compositor/.prev_CMakeLists.txt | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/compositor/.prev_CMakeLists.txt b/src/compositor/.prev_CMakeLists.txt index d5bcb7138..bb9809c75 100644 --- a/src/compositor/.prev_CMakeLists.txt +++ b/src/compositor/.prev_CMakeLists.txt @@ -132,15 +132,6 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl Qt::OpenGL ) -qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon - LIBRARIES - Qt::XkbCommonSupportPrivate - PUBLIC_LIBRARIES - XKB::XKB - PRIVATE_MODULE_INTERFACE - Qt::XkbCommonSupportPrivate -) - qt_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick SOURCES extensions/qwaylandivisurfaceintegration.cpp extensions/qwaylandivisurfaceintegration_p.h @@ -165,6 +156,11 @@ qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice wayland_wrapper/qwldatasource.cpp wayland_wrapper/qwldatasource_p.h ) +qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon + PUBLIC_LIBRARIES + XKB::XKB +) + qt_extend_target(WaylandCompositor CONDITION QT_FEATURE_im SOURCES compositor_api/qwaylandinputmethodcontrol.cpp compositor_api/qwaylandinputmethodcontrol.h compositor_api/qwaylandinputmethodcontrol_p.h |