From f595c1523e28dbdcd5b6d8455af7e4fc815bccfc Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 21 Oct 2020 12:00:27 +0200 Subject: CMake: Check for system_xcb_xinput feature When compiling the xcb qpa plugin we should check the value of the 'system_xcb_xinput' feature to decide whether to use the system library or the bundled one, instead of checking for the existence of the XCB::INPUT target. This fixes -DINPUT_bundled_xcb_xinput=yes aka -xcb-native-painting to influence what gets built into our release Linux packages. Task-number: QTBUG-86053 Change-Id: I78c5eaacb7b6bd6e46afea49189e6111e198fb27 Reviewed-by: Joerg Bornemann --- src/plugins/platforms/xcb/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/platforms') diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index 7e78e9502f..6d6b76a641 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -138,7 +138,7 @@ qt_internal_extend_target(XcbQpa CONDITION QT_FEATURE_fontconfig AND QT_FEATURE_ ) # special case begin -if(TARGET XCB::XINPUT) +if(QT_FEATURE_system_xcb_xinput) qt_internal_extend_target(XcbQpa LIBRARIES XCB::XINPUT) else() set(xinput_source "${PROJECT_SOURCE_DIR}/src/3rdparty/xcb/libxcb/xinput.c") -- cgit v1.2.3