summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-10-21 12:00:27 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-10-23 01:32:53 +0200
commitf595c1523e28dbdcd5b6d8455af7e4fc815bccfc (patch)
tree712762dad7193b3a3db431ae493612e23cdb0bfb /src
parent5d81a5d4f9ad5b3cfb12e2c00fe63a29d056868f (diff)
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 <joerg.bornemann@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/xcb/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
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")