1 files changed, 28 insertions, 17 deletions
diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
index 9390d04983..34c671c8c7 100644
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -5,14 +5,17 @@ DEFINES += QT_NO_FOREACH
 QT += \
     core-private gui-private \
     service_support-private theme_support-private \
-    eventdispatcher_support-private fontdatabase_support-private \
-    edid_support-private
+    fontdatabase_support-private \
+    edid_support-private \
+    xkbcommon_support-private
 
 qtHaveModule(linuxaccessibility_support-private): \
     QT += linuxaccessibility_support-private
 
 qtConfig(vulkan): QT += vulkan_support-private
 
+qtConfig(glib) : QMAKE_USE_PRIVATE += glib
+
 SOURCES = \
         qxcbclipboard.cpp \
         qxcbconnection.cpp \
@@ -27,7 +30,12 @@ SOURCES = \
         qxcbcursor.cpp \
         qxcbimage.cpp \
         qxcbxsettings.cpp \
-        qxcbsystemtraytracker.cpp
+        qxcbsystemtraytracker.cpp \
+        qxcbeventqueue.cpp \
+        qxcbeventdispatcher.cpp \
+        qxcbconnection_basic.cpp \
+        qxcbconnection_screens.cpp \
+        qxcbatom.cpp
 
 HEADERS = \
         qxcbclipboard.h \
@@ -45,7 +53,10 @@ HEADERS = \
         qxcbimage.h \
         qxcbxsettings.h \
         qxcbsystemtraytracker.h \
-        qxcbxkbcommon.h
+        qxcbeventqueue.h \
+        qxcbeventdispatcher.h \
+        qxcbconnection_basic.h \
+        qxcbatom.h
 
 qtConfig(draganddrop) {
     SOURCES += qxcbdrag.cpp
@@ -84,25 +95,25 @@ qtConfig(vulkan) {
 }
 
 !qtConfig(system-xcb) {
-    QMAKE_USE += xcb-static xcb
+    QMAKE_USE += xcb-static
 } else {
-    qtConfig(xkb): QMAKE_USE += xcb_xkb
-    qtConfig(xcb-render): QMAKE_USE += xcb_render
     qtConfig(xcb-xinput): QMAKE_USE += xcb_xinput
-    QMAKE_USE += xcb_syslibs
+    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
 
-# libxkbcommon
-!qtConfig(xkbcommon-system) {
-    qtConfig(xkb) {
-        include(../../../3rdparty/xkbcommon-x11.pri)
-    } else {
-        include(../../../3rdparty/xkbcommon.pri)
-    }
-} else {
-    QMAKE_USE += xkbcommon
+QMAKE_USE += xkbcommon
+qtConfig(xkb) {
+    QMAKE_USE += xkbcommon_x11
+    qtConfig(system-xcb): QMAKE_USE += xcb_xkb
 }
 
 qtConfig(dlopen): QMAKE_USE += libdl
 
+# qxcbkeyboard.cpp's KeyTbl has more than 256 levels of expansion and older
+# Clang uses that as a limit (it's 1024 in current versions).
+clang:!intel_icc: QMAKE_CXXFLAGS += -ftemplate-depth=1024
+
 load(qt_module)