1 files changed, 18 insertions, 7 deletions
diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
index 9c4797ac26..c65b145fb6 100644
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -5,7 +5,7 @@ DEFINES += QT_NO_FOREACH
 QT += \
     core-private gui-private \
     service_support-private theme_support-private \
-    eventdispatcher_support-private fontdatabase_support-private \
+    fontdatabase_support-private \
     edid_support-private
 
 qtHaveModule(linuxaccessibility_support-private): \
@@ -13,6 +13,8 @@ qtHaveModule(linuxaccessibility_support-private): \
 
 qtConfig(vulkan): QT += vulkan_support-private
 
+qtConfig(glib) : QMAKE_USE_PRIVATE += glib
+
 SOURCES = \
         qxcbclipboard.cpp \
         qxcbconnection.cpp \
@@ -27,7 +29,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 +52,11 @@ HEADERS = \
         qxcbimage.h \
         qxcbxsettings.h \
         qxcbsystemtraytracker.h \
-        qxcbxkbcommon.h
+        qxcbxkbcommon.h \
+        qxcbeventqueue.h \
+        qxcbeventdispatcher.h \
+        qxcbconnection_basic.h \
+        qxcbatom.h
 
 qtConfig(draganddrop) {
     SOURCES += qxcbdrag.cpp
@@ -58,11 +69,10 @@ DEFINES += QT_BUILD_XCB_PLUGIN
 
 qtConfig(xcb-xlib) {
     QMAKE_USE += xcb_xlib
+}
 
-    qtConfig(xinput2) {
-        SOURCES += qxcbconnection_xi2.cpp
-        QMAKE_USE += xinput2
-    }
+qtConfig(xcb-xinput) {
+    SOURCES += qxcbconnection_xi2.cpp
 }
 
 qtConfig(xcb-sm) {
@@ -89,6 +99,7 @@ qtConfig(vulkan) {
 } 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
 }