Move UNIX services into QtGui

Task-number: QTBUG-83255 Change-Id: I95cd25c6e18ffb46955acc76d6cab551d1c8f5ae Reviewed-by: Tor Arne Vestbø <[email protected]>
chain78 · Jun 18, 2020 · 7e83f09 · 7e83f09
1 parent ab01885
commit 7e83f09
Show file tree

Hide file tree

Showing 36 changed files with 44 additions and 84 deletions.
diff --git 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
@@ -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/...ices/genericunix/qgenericunixservices.cpp → ...ui/platform/unix/qgenericunixservices.cpp b/...ices/genericunix/qgenericunixservices.cpp → ...ui/platform/unix/qgenericunixservices.cpp
diff --git a/...ices/genericunix/qgenericunixservices_p.h → ...ui/platform/unix/qgenericunixservices_p.h b/...ices/genericunix/qgenericunixservices_p.h → ...ui/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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/src/platformsupport/services/genericunix/genericunix.pri b/src/platformsupport/services/genericunix/genericunix.pri
diff --git a/src/platformsupport/services/services.pro b/src/platformsupport/services/services.pro
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
 

diff --git a/sync.profile b/sync.profile
@@ -15,7 +15,6 @@
     "QtDeviceDiscoverySupport" => "$basedir/src/platformsupport/devicediscovery",
     "QtInputSupport" => "$basedir/src/platformsupport/input",
     "QtXkbCommonSupport" => "$basedir/src/platformsupport/input/xkbcommon",
-    "QtServiceSupport" => "$basedir/src/platformsupport/services",
     "QtThemeSupport" => "$basedir/src/platformsupport/themes",
     "QtEglSupport" => "$basedir/src/platformsupport/eglconvenience",
     "QtFbSupport" => "$basedir/src/platformsupport/fbconvenience",