Move UNIX services into QtGui

Task-number: QTBUG-83255
Change-Id: I95cd25c6e18ffb46955acc76d6cab551d1c8f5ae
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Friedemann Kleint 2020-06-15 10:54:00 +02:00
parent ab01885e48
commit 7e83f09ead
36 changed files with 44 additions and 84 deletions

View File

@ -711,6 +711,16 @@ qt_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
GLIB2::GLIB2 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 qt_extend_target(Gui CONDITION IOS OR MACOS
SOURCES SOURCES
rhi/qrhimetal.mm rhi/qrhimetal_p.h rhi/qrhimetal.mm rhi/qrhimetal_p.h

View File

@ -859,6 +859,16 @@ qt_extend_target(Gui CONDITION QT_FEATURE_glib AND UNIX
GLIB2::GLIB2 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 qt_extend_target(Gui CONDITION IOS OR MACOS
SOURCES SOURCES
rhi/qrhimetal.mm rhi/qrhimetal_p.h rhi/qrhimetal.mm rhi/qrhimetal_p.h

View File

@ -44,8 +44,8 @@
// W A R N I N G // W A R N I N G
// ------------- // -------------
// //
// This file is not part of the Qt API. It exists purely as an // This file is not part of the Qt API. It exists purely as an
// implementation detail. This header file may change from version to // implementation detail. This header file may change from version to
// version without notice, or even be removed. // version without notice, or even be removed.
// //
// We mean it. // We mean it.
@ -56,7 +56,7 @@
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QGenericUnixServices : public QPlatformServices class Q_GUI_EXPORT QGenericUnixServices : public QPlatformServices
{ {
public: public:
QGenericUnixServices() {} QGenericUnixServices() {}

View File

@ -6,8 +6,18 @@ HEADERS += \
platform/unix/qunixeventdispatcher_qpa_p.h \ platform/unix/qunixeventdispatcher_qpa_p.h \
platform/unix/qgenericunixeventdispatcher_p.h platform/unix/qgenericunixeventdispatcher_p.h
qtConfig(glib) { qtConfig(glib) {
SOURCES += platform/unix/qeventdispatcher_glib.cpp SOURCES += platform/unix/qeventdispatcher_glib.cpp
HEADERS += platform/unix/qeventdispatcher_glib_p.h HEADERS += platform/unix/qeventdispatcher_glib_p.h
QMAKE_USE_PRIVATE += glib 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
}

View File

@ -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) if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon)
add_subdirectory(input) add_subdirectory(input)
endif() endif()
if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT))
add_subdirectory(services)
endif()
if(QT_FEATURE_egl) if(QT_FEATURE_egl)
add_subdirectory(eglconvenience) add_subdirectory(eglconvenience)
endif() endif()

View File

@ -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) if(QT_FEATURE_evdev OR QT_FEATURE_integrityhid OR QT_FEATURE_libinput OR QT_FEATURE_tslib OR QT_FEATURE_xkbcommon)
add_subdirectory(input) add_subdirectory(input)
endif() endif()
if(QT_FEATURE_xcb OR (UNIX AND NOT UIKIT))
add_subdirectory(services)
endif()
if(QT_FEATURE_egl) if(QT_FEATURE_egl)
add_subdirectory(eglconvenience) add_subdirectory(eglconvenience)
endif() endif()

View File

@ -14,9 +14,6 @@ qtConfig(evdev)|qtConfig(tslib)|qtConfig(libinput)|qtConfig(integrityhid)|qtConf
input.depends += devicediscovery input.depends += devicediscovery
} }
if(unix:!uikit)|qtConfig(xcb): \
SUBDIRS += services
qtConfig(egl): \ qtConfig(egl): \
SUBDIRS += eglconvenience SUBDIRS += eglconvenience
qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2): \ qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2): \

View File

@ -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
)

View File

@ -1,2 +0,0 @@
HEADERS += $$PWD/qgenericunixservices_p.h
SOURCES += $$PWD/qgenericunixservices.cpp

View File

@ -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)

View File

@ -2,7 +2,6 @@ TARGET = qbsdfb
QT += \ QT += \
core-private gui-private \ core-private gui-private \
service_support-private \
fb_support-private fb_support-private
qtHaveModule(input_support-private): \ qtHaveModule(input_support-private): \

View File

@ -42,7 +42,7 @@
#include "qbsdfbscreen.h" #include "qbsdfbscreen.h"
#include <QtGui/private/qgenericunixfontdatabase_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 <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtFbSupport/private/qfbvthandler_p.h> #include <QtFbSupport/private/qfbvthandler_p.h>

View File

@ -24,7 +24,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
) )
#### Keys ignored in scope 1:.:.:directfb.pro:<TRUE>: #### Keys ignored in scope 1:.:.:directfb.pro:<TRUE>:

View File

@ -28,7 +28,6 @@ qt_internal_add_plugin(QDirectFbIntegrationPlugin
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
) )
#### Keys ignored in scope 1:.:.:directfb.pro:<TRUE>: #### Keys ignored in scope 1:.:.:directfb.pro:<TRUE>:

View File

@ -1,8 +1,7 @@
TARGET = qdirectfb TARGET = qdirectfb
QT += \ QT += \
core-private gui-private \ core-private gui-private
service_support-private
QMAKE_USE += directfb QMAKE_USE += directfb

View File

@ -46,7 +46,7 @@
#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtGui/private/qgenericunixfontdatabase_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_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_blitter_p.h>
#include <QtGui/private/qpixmap_raster_p.h> #include <QtGui/private/qpixmap_raster_p.h>

View File

@ -25,7 +25,6 @@ qt_add_module(EglFSDeviceIntegration
Qt::EglSupportPrivate Qt::EglSupportPrivate
Qt::FbSupportPrivate Qt::FbSupportPrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate Qt::ThemeSupportPrivate
) )

View File

@ -26,7 +26,6 @@ qt_add_module(EglFSDeviceIntegration
Qt::EglSupportPrivate Qt::EglSupportPrivate
Qt::FbSupportPrivate Qt::FbSupportPrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate Qt::ThemeSupportPrivate
EGL::EGL # special case EGL::EGL # special case
) )

View File

@ -68,7 +68,7 @@
#endif #endif
#include <QtGui/private/qgenericunixfontdatabase_p.h> #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 <QtThemeSupport/private/qgenericunixthemes_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtFbSupport/private/qfbvthandler_p.h> #include <QtFbSupport/private/qfbvthandler_p.h>

View File

@ -11,7 +11,7 @@ MODULE = eglfsdeviceintegration
QT += \ QT += \
core-private gui-private \ core-private gui-private \
devicediscovery_support-private \ devicediscovery_support-private \
service_support-private theme_support-private \ theme_support-private \
fb_support-private egl_support-private fb_support-private egl_support-private
qtHaveModule(input_support-private): \ qtHaveModule(input_support-private): \

View File

@ -2,7 +2,6 @@ TARGET = integrityfb
QT += \ QT += \
core-private gui-private \ core-private gui-private \
service_support-private \
fb_support-private fb_support-private
SOURCES = \ SOURCES = \

View File

@ -42,7 +42,7 @@
#include "qintegrityhidmanager.h" #include "qintegrityhidmanager.h"
#include <QtGui/private/qgenericunixfontdatabase_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 <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtFbSupport/private/qfbbackingstore_p.h> #include <QtFbSupport/private/qfbbackingstore_p.h>

View File

@ -19,7 +19,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
Qt::FbSupportPrivate Qt::FbSupportPrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
) )
#### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>: #### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>:

View File

@ -20,7 +20,6 @@ qt_internal_add_plugin(QLinuxFbIntegrationPlugin
Qt::FbSupportPrivate Qt::FbSupportPrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
) )
#### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>: #### Keys ignored in scope 1:.:.:linuxfb.pro:<TRUE>:

View File

@ -4,7 +4,6 @@ DEFINES += QT_NO_FOREACH
QT += \ QT += \
core-private gui-private \ core-private gui-private \
service_support-private \
fb_support-private fb_support-private
qtHaveModule(input_support-private): \ qtHaveModule(input_support-private): \

View File

@ -44,7 +44,7 @@
#endif #endif
#include <QtGui/private/qgenericunixfontdatabase_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 <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtFbSupport/private/qfbvthandler_p.h> #include <QtFbSupport/private/qfbvthandler_p.h>

View File

@ -22,7 +22,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
Qt::Network Qt::Network
Qt::ServiceSupportPrivate
) )
#### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>: #### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>:

View File

@ -23,7 +23,6 @@ qt_internal_add_plugin(QVncIntegrationPlugin
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
Qt::Network Qt::Network
Qt::ServiceSupportPrivate
) )
#### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>: #### Keys ignored in scope 1:.:.:vnc.pro:<TRUE>:

View File

@ -42,7 +42,7 @@
#include "qvnc_p.h" #include "qvnc_p.h"
#include <QtGui/private/qgenericunixfontdatabase_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 <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtFbSupport/private/qfbbackingstore_p.h> #include <QtFbSupport/private/qfbbackingstore_p.h>

View File

@ -2,7 +2,7 @@ TARGET = qvnc
QT += \ QT += \
core-private network gui-private \ core-private network gui-private \
service_support-private fb_support-private fb_support-private
qtHaveModule(input_support-private): \ qtHaveModule(input_support-private): \
QT += input_support-private QT += input_support-private

View File

@ -43,7 +43,6 @@ qt_add_module(XcbQpa
Qt::CorePrivate Qt::CorePrivate
Qt::EdidSupportPrivate Qt::EdidSupportPrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate Qt::ThemeSupportPrivate
Qt::XkbCommonSupportPrivate Qt::XkbCommonSupportPrivate
XCB::ICCCM XCB::ICCCM

View File

@ -43,7 +43,6 @@ qt_add_module(XcbQpa
Qt::CorePrivate Qt::CorePrivate
Qt::EdidSupportPrivate Qt::EdidSupportPrivate
Qt::GuiPrivate Qt::GuiPrivate
Qt::ServiceSupportPrivate
Qt::ThemeSupportPrivate Qt::ThemeSupportPrivate
Qt::XkbCommonSupportPrivate Qt::XkbCommonSupportPrivate
XCB::ICCCM XCB::ICCCM

View File

@ -60,7 +60,7 @@
#include <xcb/xcb.h> #include <xcb/xcb.h>
#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtGui/private/qgenericunixfontdatabase_p.h>
#include <QtServiceSupport/private/qgenericunixservices_p.h> #include <QtGui/private/qgenericunixservices_p.h>
#if QT_CONFIG(opengl) #if QT_CONFIG(opengl)
#include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h> #include <QtOpenGL/qpa/qplatformbackingstoreopenglsupport.h>
#endif #endif

View File

@ -4,7 +4,7 @@ DEFINES += QT_NO_FOREACH
QT += \ QT += \
core-private gui-private \ core-private gui-private \
service_support-private theme_support-private \ theme_support-private \
edid_support-private \ edid_support-private \
xkbcommon_support-private xkbcommon_support-private

View File

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