summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorPovilas Kanapickas <povilas@radix.lt>2021-11-13 20:05:28 +0200
committerPovilas Kanapickas <povilas@radix.lt>2021-11-18 02:32:58 +0200
commitb00fe3c9aa2ccd18ea853ddea73a9e2268521f91 (patch)
tree504e2777730859fdfd60256db93b326ed2a43317 /src/gui
parent536471106d47bb99680f8e0dbb448c9671914309 (diff)
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 <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/configure.cmake1
1 files changed, 1 insertions, 0 deletions
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'