Move UNIX services into QtGui

Task-number: QTBUG-83255
Change-Id: I95cd25c6e18ffb46955acc76d6cab551d1c8f5ae
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>

35 files changed, 44 insertions, 83 deletions

diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 85944bf29f..5db0168781 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -711,6 +711,16 @@ qt_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
         GLIB2::GLIB2
 )
 
+qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
+    SOURCES
+        platform/unix/qgenericunixservices.cpp platform/unix/qgenericunixservices_p.h
+)
+
+qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
+    LIBRARIES
+        Qt::DBus
+)
+
 qt_extend_target(Gui CONDITION IOS OR MACOS
     SOURCES
         rhi/qrhimetal.mm rhi/qrhimetal_p.h
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 205a2392d7..7a7989630e 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -859,6 +859,16 @@ qt_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
         GLIB2::GLIB2
 )
 
+qt_extend_target(Gui CONDITION UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
+    SOURCES
+        platform/unix/qgenericunixservices.cpp platform/unix/qgenericunixservices_p.h
+)
+
+qt_extend_target(Gui CONDITION TARGET Qt::DBus AND UNIX AND (QT_FEATURE_xcb OR NOT UIKIT)
+    LIBRARIES
+        Qt::DBus
+)
+
 qt_extend_target(Gui CONDITION IOS OR MACOS
     SOURCES
         rhi/qrhimetal.mm rhi/qrhimetal_p.h
diff --git a/src/platformsupport/services/genericunix/qgenericunixservices.cpp b/src/gui/platform/unix/qgenericunixservices.cpp
index 10d5468b9a..10d5468b9a 100644
--- a/src/platformsupport/services/genericunix/qgenericunixservices.cpp
+++ b/src/gui/platform/unix/qgenericunixservices.cpp
diff --git a/src/platformsupport/services/genericunix/qgenericunixservices_p.h b/src/gui/platform/unix/qgenericunixservices_p.h
index 8ac3de6f03..0634360c41 100644
--- a/src/platformsupport/services/genericunix/qgenericunixservices_p.h
+++ b/src/gui/platform/unix/qgenericunixservices_p.h
@@ -44,8 +44,8 @@
 //  W A R N I N G
 //  -------------
 //
-// This file is not part of the Qt API.  It exists purely as an
-// implementation detail.  This header file may change from version to
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
 // version without notice, or even be removed.
 //
 // We mean it.
@@ -56,7 +56,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class QGenericUnixServices : public QPlatformServices
+class Q_GUI_EXPORT QGenericUnixServices : public QPlatformServices
 {
 public:
     QGenericUnixServices() {}
diff --git a/src/gui/platform/unix/unix.pri b/src/gui/platform/unix/unix.pri
index b0274989e0..b203e81b24 100644
--- a/src/gui/platform/unix/unix.pri
+++ b/src/gui/platform/unix/unix.pri
@@ -6,8 +6,18 @@ HEADERS += \
     platform/unix/qunixeventdispatcher_qpa_p.h \
     platform/unix/qgenericunixeventdispatcher_p.h
 
+
 qtConfig(glib) {
     SOURCES += platform/unix/qeventdispatcher_glib.cpp
     HEADERS += platform/unix/qeventdispatcher_glib_p.h
     QMAKE_USE_PRIVATE += glib
 }
+
+if(unix:!uikit)|qtConfig(xcb) {
+    SOURCES += \
+        platform/unix/qgenericunixservices.cpp
+    HEADERS += \
+        platform/unix/qgenericunixservices_p.h
+
+    qtHaveModule(dbus): QT_PRIVATE += dbus
+}
diff --git a/src/platformsupport/.prev_CMakeLists.txt b/src/platformsupport/.prev_CMakeLists.txt
index a435067b73..157a53aeca 100644
--- a/src/platformsupport/.prev_CMakeLists.txt
+++ b/src/platformsupport/.prev_CMakeLists.txt
@@ -10,9 +10,6 @@ endif()
 if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon)
     add_subdirectory(input)
 endif()
-if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT))
-    add_subdirectory(services)
-endif()
 if(QT_FEATURE_egl)
     add_subdirectory(eglconvenience)
 endif()
diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt
index 5318c26cf3..3d2586e7f1 100644
--- a/src/platformsupport/CMakeLists.txt
+++ b/src/platformsupport/CMakeLists.txt
@@ -14,9 +14,6 @@ endif()
 if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon)
     add_subdirectory(input)
 endif()
-if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT))
-    add_subdirectory(services)
-endif()
 if(QT_FEATURE_egl)
     add_subdirectory(eglconvenience)
 endif()
diff --git a/src/platformsupport/platformsupport.pro b/src/platformsupport/platformsupport.pro
index e54fb96dbe..406c21d6bd 100644
--- a/src/platformsupport/platformsupport.pro
+++ b/src/platformsupport/platformsupport.pro
@@ -14,9 +14,6 @@ qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConf
     input.depends += devicediscovery
 }
 
-if(unix:!uikit)|qtConfig(xcb): \
-    SUBDIRS += services
-
 qtConfig(egl): \
     SUBDIRS += eglconvenience
 qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2): \
diff --git a/src/platformsupport/services/CMakeLists.txt b/src/platformsupport/services/CMakeLists.txt
deleted file mode 100644
index 602dd40305..0000000000
--- a/src/platformsupport/services/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-# Generated from services.pro.
-
-#####################################################################
-## ServiceSupport Module:
-#####################################################################
-
-qt_add_module(ServiceSupport
-    STATIC
-    INTERNAL_MODULE
-    SOURCES
-        genericunix/qgenericunixservices.cpp genericunix/qgenericunixservices_p.h
-    DEFINES
-        QT_NO_CAST_FROM_ASCII
-    PUBLIC_LIBRARIES
-        Qt::CorePrivate
-        Qt::GuiPrivate
-    PRECOMPILED_HEADER
-        "../../corelib/global/qt_pch.h"
-)
-
-#### Keys ignored in scope 1:.:.:services.pro:<TRUE>:
-# MODULE = "service_support"
-
-## Scopes:
-#####################################################################
-
-qt_extend_target(ServiceSupport CONDITION QT_FEATURE_dbus
-    PUBLIC_LIBRARIES
-        Qt::DBus
-)
diff --git a/src/platformsupport/services/genericunix/genericunix.pri b/src/platformsupport/services/genericunix/genericunix.pri
deleted file mode 100644
index 6afafa31d0..0000000000
--- a/src/platformsupport/services/genericunix/genericunix.pri
+++ /dev/null
@@ -1,2 +0,0 @@
-HEADERS += $$PWD/qgenericunixservices_p.h
-SOURCES += $$PWD/qgenericunixservices.cpp
diff --git a/src/platformsupport/services/services.pro b/src/platformsupport/services/services.pro
deleted file mode 100644
index 7ff5e8e179..0000000000
--- a/src/platformsupport/services/services.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET = QtServiceSupport
-MODULE = service_support
-
-QT = core-private gui-private
-qtConfig(dbus): QT += dbus
-
-CONFIG += static internal_module
-
-DEFINES += QT_NO_CAST_FROM_ASCII
-PRECOMPILED_HEADER = ../../corelib/global/qt_pch.h
-
-include($$PWD/genericunix/genericunix.pri)
-
-load(qt_module)
diff --git a/src/plugins/platforms/bsdfb/bsdfb.pro b/src/plugins/platforms/bsdfb/bsdfb.pro
index 21ebbb0496..ac2dfa9e68 100644
--- a/src/plugins/platforms/bsdfb/bsdfb.pro
+++ b/src/plugins/platforms/bsdfb/bsdfb.pro
@@ -2,7 +2,6 @@ TARGET = qbsdfb
 
 QT += \
     core-private gui-private \
-    service_support-private \
     fb_support-private
 
 qtHaveModule(input_support-private): \
diff --git a/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp b/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp
index 04c84d2942..9abc2f81fa 100644
--- a/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp
+++ b/src/plugins/platforms/bsdfb/qbsdfbintegration.cpp
@@ -42,7 +42,7 @@
 #include "qbsdfbscreen.h"
 
 #include <QtGui/private/qgenericunixfontdatabase_p.h>
-#include <QtServiceSupport/private/qgenericunixservices_p.h>
+#include <QtGui/private/qgenericunixservices_p.h>
 #include <QtGui/private/qgenericunixeventdispatcher_p.h>
 
 #include <QtFbSupport/private/qfbvthandler_p.h>
diff --git a/src/plugins/platforms/directfb/.prev_CMakeLists.txt b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
index a9bac7c988..15e43244f0 100644
--- a/src/plugins/platforms/directfb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/directfb/.prev_CMakeLists.txt
@@ -24,7 +24,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
         Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:directfb.pro:<TRUE>:
diff --git a/src/plugins/platforms/directfb/CMakeLists.txt b/src/plugins/platforms/directfb/CMakeLists.txt
index ce6e4af3a3..be6e08bd8e 100644
--- a/src/plugins/platforms/directfb/CMakeLists.txt
+++ b/src/plugins/platforms/directfb/CMakeLists.txt
@@ -28,7 +28,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
         Qt::CorePrivate
         Qt::Gui
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:directfb.pro:<TRUE>:
diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro
index 57195de551..d63d2469ff 100644
--- a/src/plugins/platforms/directfb/directfb.pro
+++ b/src/plugins/platforms/directfb/directfb.pro
@@ -1,8 +1,7 @@
 TARGET = qdirectfb
 
 QT += \
-    core-private gui-private \
-    service_support-private
+    core-private gui-private
 
 QMAKE_USE += directfb
 
diff --git a/src/plugins/platforms/directfb/qdirectfbintegration.cpp b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
index 393ce69c52..0212f52afa 100644
--- a/src/plugins/platforms/directfb/qdirectfbintegration.cpp
+++ b/src/plugins/platforms/directfb/qdirectfbintegration.cpp
@@ -46,7 +46,7 @@
 
 #include <QtGui/private/qgenericunixfontdatabase_p.h>
 #include <QtGui/private/qgenericunixeventdispatcher_p.h>
-#include <QtServiceSupport/private/qgenericunixservices_p.h>
+#include <QtGui/private/qgenericunixservices_p.h>
 
 #include <QtGui/private/qpixmap_blitter_p.h>
 #include <QtGui/private/qpixmap_raster_p.h>
diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
index 106e94718a..900be49379 100644
--- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt
@@ -25,7 +25,6 @@ qt_add_module(EglFSDeviceIntegration
         Qt::EglSupportPrivate
         Qt::FbSupportPrivate
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
         Qt::ThemeSupportPrivate
 )
 
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt
index d1211f38b8..8e625fdc58 100644
--- a/src/plugins/platforms/eglfs/CMakeLists.txt
+++ b/src/plugins/platforms/eglfs/CMakeLists.txt
@@ -26,7 +26,6 @@ qt_add_module(EglFSDeviceIntegration
         Qt::EglSupportPrivate
         Qt::FbSupportPrivate
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
         Qt::ThemeSupportPrivate
         EGL::EGL # special case
 )
diff --git a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
index 651c28745b..ecabfee101 100644
--- a/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
+++ b/src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
@@ -68,7 +68,7 @@
 #endif
 
 #include <QtGui/private/qgenericunixfontdatabase_p.h>
-#include <QtServiceSupport/private/qgenericunixservices_p.h>
+#include <QtGui/private/qgenericunixservices_p.h>
 #include <QtThemeSupport/private/qgenericunixthemes_p.h>
 #include <QtGui/private/qgenericunixeventdispatcher_p.h>
 #include <QtFbSupport/private/qfbvthandler_p.h>
diff --git a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
index dce1a4b894..87eb8515eb 100644
--- a/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
+++ b/src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
@@ -11,7 +11,7 @@ MODULE = eglfsdeviceintegration
 QT += \
     core-private gui-private \
     devicediscovery_support-private \
-    service_support-private theme_support-private \
+    theme_support-private \
     fb_support-private egl_support-private
 
 qtHaveModule(input_support-private): \
diff --git a/src/plugins/platforms/integrity/integrity.pro b/src/plugins/platforms/integrity/integrity.pro
index 51511f38a6..7280f66863 100644
--- a/src/plugins/platforms/integrity/integrity.pro
+++ b/src/plugins/platforms/integrity/integrity.pro
@@ -2,7 +2,6 @@ TARGET = integrityfb
 
 QT += \
     core-private gui-private \
-    service_support-private \
     fb_support-private
 
 SOURCES = \
diff --git a/src/plugins/platforms/integrity/qintegrityfbintegration.cpp b/src/plugins/platforms/integrity/qintegrityfbintegration.cpp
index d53088dff7..5aad06189d 100644
--- a/src/plugins/platforms/integrity/qintegrityfbintegration.cpp
+++ b/src/plugins/platforms/integrity/qintegrityfbintegration.cpp
@@ -42,7 +42,7 @@
 #include "qintegrityhidmanager.h"
 
 #include <QtGui/private/qgenericunixfontdatabase_p.h>
-#include <QtServiceSupport/private/qgenericunixservices_p.h>
+#include <QtGui/private/qgenericunixservices_p.h>
 #include <QtGui/private/qgenericunixeventdispatcher_p.h>
 
 #include <QtFbSupport/private/qfbbackingstore_p.h>
diff --git a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
index caa3f03f5d..258b70603e 100644
--- a/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/.prev_CMakeLists.txt
@@ -19,7 +19,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
         Qt::FbSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>:
diff --git a/src/plugins/platforms/linuxfb/CMakeLists.txt b/src/plugins/platforms/linuxfb/CMakeLists.txt
index fdfe076902..ea5642f1c0 100644
--- a/src/plugins/platforms/linuxfb/CMakeLists.txt
+++ b/src/plugins/platforms/linuxfb/CMakeLists.txt
@@ -20,7 +20,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
         Qt::FbSupportPrivate
         Qt::Gui
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>:
diff --git a/src/plugins/platforms/linuxfb/linuxfb.pro b/src/plugins/platforms/linuxfb/linuxfb.pro
index 9af0956cf7..08a4d6dd0c 100644
--- a/src/plugins/platforms/linuxfb/linuxfb.pro
+++ b/src/plugins/platforms/linuxfb/linuxfb.pro
@@ -4,7 +4,6 @@ DEFINES += QT_NO_FOREACH
 
 QT += \
     core-private gui-private \
-    service_support-private \
     fb_support-private
 
 qtHaveModule(input_support-private): \
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
index 4940302d36..68c68ab8f6 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
@@ -44,7 +44,7 @@
 #endif
 
 #include <QtGui/private/qgenericunixfontdatabase_p.h>
-#include <QtServiceSupport/private/qgenericunixservices_p.h>
+#include <QtGui/private/qgenericunixservices_p.h>
 #include <QtGui/private/qgenericunixeventdispatcher_p.h>
 
 #include <QtFbSupport/private/qfbvthandler_p.h>
diff --git a/src/plugins/platforms/vnc/.prev_CMakeLists.txt b/src/plugins/platforms/vnc/.prev_CMakeLists.txt
index ebe1cd62d4..ab11e57f0d 100644
--- a/src/plugins/platforms/vnc/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/vnc/.prev_CMakeLists.txt
@@ -22,7 +22,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin
         Qt::Gui
         Qt::GuiPrivate
         Qt::Network
-        Qt::ServiceSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>:
diff --git a/src/plugins/platforms/vnc/CMakeLists.txt b/src/plugins/platforms/vnc/CMakeLists.txt
index 6347030b34..5024459cf4 100644
--- a/src/plugins/platforms/vnc/CMakeLists.txt
+++ b/src/plugins/platforms/vnc/CMakeLists.txt
@@ -23,7 +23,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin
         Qt::Gui
         Qt::GuiPrivate
         Qt::Network
-        Qt::ServiceSupportPrivate
 )
 
 #### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>:
diff --git a/src/plugins/platforms/vnc/qvncintegration.cpp b/src/plugins/platforms/vnc/qvncintegration.cpp
index 6a0cc79402..9836839274 100644
--- a/src/plugins/platforms/vnc/qvncintegration.cpp
+++ b/src/plugins/platforms/vnc/qvncintegration.cpp
@@ -42,7 +42,7 @@
 #include "qvnc_p.h"
 
 #include <QtGui/private/qgenericunixfontdatabase_p.h>
-#include <QtServiceSupport/private/qgenericunixservices_p.h>
+#include <QtGui/private/qgenericunixservices_p.h>
 #include <QtGui/private/qgenericunixeventdispatcher_p.h>
 
 #include <QtFbSupport/private/qfbbackingstore_p.h>
diff --git a/src/plugins/platforms/vnc/vnc.pro b/src/plugins/platforms/vnc/vnc.pro
index c679b114ab..a250ba999e 100644
--- a/src/plugins/platforms/vnc/vnc.pro
+++ b/src/plugins/platforms/vnc/vnc.pro
@@ -2,7 +2,7 @@ TARGET = qvnc
 
 QT += \
     core-private network gui-private \
-    service_support-private fb_support-private
+    fb_support-private
 
 qtHaveModule(input_support-private): \
     QT += input_support-private
diff --git a/src/plugins/platforms/xcb/.prev_CMakeLists.txt b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
index c5012582ea..83df27ddd0 100644
--- a/src/plugins/platforms/xcb/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/xcb/.prev_CMakeLists.txt
@@ -43,7 +43,6 @@ qt_add_module(XcbQpa
         Qt::CorePrivate
         Qt::EdidSupportPrivate
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
         Qt::ThemeSupportPrivate
         Qt::XkbCommonSupportPrivate
         XCB::ICCCM
diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt
index 1288cc6a5f..28861862d8 100644
--- a/src/plugins/platforms/xcb/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/CMakeLists.txt
@@ -43,7 +43,6 @@ qt_add_module(XcbQpa
         Qt::CorePrivate
         Qt::EdidSupportPrivate
         Qt::GuiPrivate
-        Qt::ServiceSupportPrivate
         Qt::ThemeSupportPrivate
         Qt::XkbCommonSupportPrivate
         XCB::ICCCM
diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp
index 7956da2c91..cec25ef47b 100644
--- a/src/plugins/platforms/xcb/qxcbintegration.cpp
+++ b/src/plugins/platforms/xcb/qxcbintegration.cpp
@@ -60,7 +60,7 @@
 #include <xcb/xcb.h>
 
 #include <QtGui/private/qgenericunixfontdatabase_p.h>
-#include <QtServiceSupport/private/qgenericunixservices_p.h>
+#include <QtGui/private/qgenericunixservices_p.h>
 #if QT_CONFIG(opengl)
 #include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
 #endif
diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
index 3cca31aa2f..0e168b9e1c 100644
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -4,7 +4,7 @@ DEFINES += QT_NO_FOREACH
 
 QT += \
     core-private gui-private \
-    service_support-private theme_support-private \
+    theme_support-private \
     edid_support-private \
     xkbcommon_support-private