1 files changed, 13 insertions, 17 deletions
diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
index 34c671c8c7..a5d05faa9c 100644
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -35,6 +35,7 @@ SOURCES = \
         qxcbeventdispatcher.cpp \
         qxcbconnection_basic.cpp \
         qxcbconnection_screens.cpp \
+        qxcbconnection_xi2.cpp \
         qxcbatom.cpp
 
 HEADERS = \
@@ -71,10 +72,6 @@ qtConfig(xcb-xlib) {
     QMAKE_USE += xcb_xlib
 }
 
-qtConfig(xcb-xinput) {
-    SOURCES += qxcbconnection_xi2.cpp
-}
-
 qtConfig(xcb-sm) {
     QMAKE_USE += x11sm
     SOURCES += qxcbsessionmanager.cpp
@@ -94,20 +91,19 @@ qtConfig(vulkan) {
         qxcbvulkanwindow.h
 }
 
-!qtConfig(system-xcb) {
-    QMAKE_USE += xcb-static
-} else {
-    qtConfig(xcb-xinput): QMAKE_USE += xcb_xinput
-    QMAKE_USE += \
-        xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil \
-        xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama
-}
-QMAKE_USE += xcb
+QMAKE_USE += \
+    xcb xcb_icccm xcb_image xcb_keysyms xcb_randr xcb_render xcb_renderutil \
+    xcb_shape xcb_shm xcb_sync xcb_xfixes xcb_xinerama xcb_xkb xkbcommon xkbcommon_x11
 
-QMAKE_USE += xkbcommon
-qtConfig(xkb) {
-    QMAKE_USE += xkbcommon_x11
-    qtConfig(system-xcb): QMAKE_USE += xcb_xkb
+qtConfig(system-xcb-xinput) {
+    QMAKE_USE += xcb_xinput
+} else {
+    # Use bundled xcb-xinput sources.
+    XCB_DIR = $$QT_SOURCE_TREE/src/3rdparty/xcb
+    INCLUDEPATH += $$XCB_DIR/include/
+    SOURCES += $$XCB_DIR/libxcb/xinput.c
+    # Ignore compiler warnings in 3rdparty C code.
+    QMAKE_CFLAGS+=-w
 }
 
 qtConfig(dlopen): QMAKE_USE += libdl