From b00fe3c9aa2ccd18ea853ddea73a9e2268521f91 Mon Sep 17 00:00:00 2001 From: Povilas Kanapickas Date: Sat, 13 Nov 2021 20:05:28 +0200 Subject: [PATCH] CMake: Enable -bundled-xcb-xinput by default This is done by disabling system-xcb-xinput feature by default. It will require user to pass -no-bundled-xcb-xinput to the configure script to override this. The reason for the change is that touchpad gesture implementation requires new code from libxcb, yet this new code is not even released yet. Even if it was released today, at least several years will pass until the new version is common enough. [ChangeLog][Third-Party Code][X11] The xcb plugin is now compiled with the bundled xcb-xinput library by default, in order to enable support for touchpad gestures. Change-Id: Iebb27ecee7facf070ef23f37a55aab0578698f16 Reviewed-by: Qt CI Bot Reviewed-by: Alexandru Croitor Reviewed-by: Shawn Rutledge --- src/gui/configure.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/configure.cmake b/src/gui/configure.cmake index 7bbb3040b1..f5d26977af 100644 --- a/src/gui/configure.cmake +++ b/src/gui/configure.cmake @@ -934,6 +934,7 @@ qt_feature("xcb-sm" PRIVATE ) qt_feature("system-xcb-xinput" PRIVATE LABEL "Using system-provided xcb-xinput" + AUTODETECT OFF CONDITION XCB_XINPUT_FOUND ENABLE INPUT_bundled_xcb_xinput STREQUAL 'no' DISABLE INPUT_bundled_xcb_xinput STREQUAL 'yes'