1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use QPlatformServices instead of QGenericUnixServices on embedded

Browse Source 
Including bsdfb/directfb/eglfs/integrity/linuxfb/vkkhrdisplay.

QGenericUnixServices is mainly for desktop usages which uses dbus
and xdg things.

Task-number: QTBUG-130884
Change-Id: I003ec780aa039610cb5c36cd67cabbf173d8f642
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit f8d0e4798c0d2985dbe5f8515a8281c9109ef6c4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Liang Qi 2024-12-05 13:27:00 +01:00
parent 2a4604e59e
commit 78da1f8d00
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/bsdfb/qbsdfbintegration.cpp
View File

@ -6,7 +6,6 @@
#include "qbsdfbscreen.h" #include "qbsdfbscreen.h"
#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtGui/private/qgenericunixfontdatabase_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>
@ -18,6 +17,7 @@
#include <qpa/qplatforminputcontext.h> #include <qpa/qplatforminputcontext.h>
#include <qpa/qplatforminputcontextfactory_p.h> #include <qpa/qplatforminputcontextfactory_p.h>
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <qpa/qplatformservices.h>
#if QT_CONFIG(tslib) #if QT_CONFIG(tslib)
#include <QtInputSupport/private/qtslib_p.h> #include <QtInputSupport/private/qtslib_p.h>
@ -97,7 +97,7 @@ QPlatformFontDatabase *QBsdFbIntegration::fontDatabase() const
QPlatformServices *QBsdFbIntegration::services() const QPlatformServices *QBsdFbIntegration::services() const
{ {
if (m_services.isNull()) if (m_services.isNull())
m_services.reset(new QGenericUnixServices); m_services.reset(new QPlatformServices);
return m_services.data(); return m_services.data();
} }

4
src/plugins/platforms/directfb/qdirectfbintegration.cpp
View File

@ -10,7 +10,6 @@
#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 <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>
@ -21,6 +20,7 @@
#include <QtCore/QAbstractEventDispatcher> #include <QtCore/QAbstractEventDispatcher>
#include <qpa/qplatforminputcontextfactory_p.h> #include <qpa/qplatforminputcontextfactory_p.h>
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <qpa/qplatformservices.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -125,7 +125,7 @@ QPlatformFontDatabase *QDirectFbIntegration::fontDatabase() const
QPlatformServices *QDirectFbIntegration::services() const QPlatformServices *QDirectFbIntegration::services() const
{ {
if (m_services.isNull()) if (m_services.isNull())
m_services.reset(new QGenericUnixServices); m_services.reset(new QPlatformServices);
return m_services.data(); return m_services.data();
} }

4
src/plugins/platforms/eglfs/api/qeglfsintegration.cpp
View File

@ -32,13 +32,13 @@
#endif #endif
#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtGui/private/qgenericunixfontdatabase_p.h>
#include <QtGui/private/qgenericunixservices_p.h>
#include <QtGui/private/qgenericunixthemes_p.h> #include <QtGui/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>
#ifndef QT_NO_OPENGL #ifndef QT_NO_OPENGL
# include <QtOpenGL/private/qopenglcompositorbackingstore_p.h> # include <QtOpenGL/private/qopenglcompositorbackingstore_p.h>
#endif #endif
#include <qpa/qplatformservices.h>
#if QT_CONFIG(libinput) #if QT_CONFIG(libinput)
#include <QtInputSupport/private/qlibinputhandler_p.h> #include <QtInputSupport/private/qlibinputhandler_p.h>
@ -132,7 +132,7 @@ QAbstractEventDispatcher *QEglFSIntegration::createEventDispatcher() const
QPlatformServices *QEglFSIntegration::services() const QPlatformServices *QEglFSIntegration::services() const
{ {
if (m_services.isNull()) if (m_services.isNull())
m_services.reset(new QGenericUnixServices); m_services.reset(new QPlatformServices);
return m_services.data(); return m_services.data();
} }

4
src/plugins/platforms/integrity/qintegrityfbintegration.cpp
View File

@ -6,7 +6,6 @@
#include "qintegrityhidmanager.h" #include "qintegrityhidmanager.h"
#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtGui/private/qgenericunixfontdatabase_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>
@ -16,6 +15,7 @@
#include <QtGui/private/qguiapplication_p.h> #include <QtGui/private/qguiapplication_p.h>
#include <qpa/qplatforminputcontextfactory_p.h> #include <qpa/qplatforminputcontextfactory_p.h>
#include <qpa/qwindowsysteminterface.h> #include <qpa/qwindowsysteminterface.h>
#include <qpa/qplatformservices.h>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -84,7 +84,7 @@ QPlatformFontDatabase *QIntegrityFbIntegration::fontDatabase() const
QPlatformServices *QIntegrityFbIntegration::services() const QPlatformServices *QIntegrityFbIntegration::services() const
{ {
if (m_services.isNull()) if (m_services.isNull())
m_services.reset(new QGenericUnixServices); m_services.reset(new QPlatformServices);
return m_services.data(); return m_services.data();
} }

4
src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
View File

@ -8,8 +8,8 @@
#endif #endif
#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtGui/private/qgenericunixfontdatabase_p.h>
#include <QtGui/private/qgenericunixservices_p.h>
#include <QtGui/private/qgenericunixeventdispatcher_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <qpa/qplatformservices.h>
#include <QtFbSupport/private/qfbvthandler_p.h> #include <QtFbSupport/private/qfbvthandler_p.h>
#include <QtFbSupport/private/qfbbackingstore_p.h> #include <QtFbSupport/private/qfbbackingstore_p.h>
@ -111,7 +111,7 @@ QPlatformFontDatabase *QLinuxFbIntegration::fontDatabase() const
QPlatformServices *QLinuxFbIntegration::services() const QPlatformServices *QLinuxFbIntegration::services() const
{ {
if (m_services.isNull()) if (m_services.isNull())
m_services.reset(new QGenericUnixServices); m_services.reset(new QPlatformServices);
return m_services.data(); return m_services.data();
} }

4
src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayintegration.cpp
View File

@ -14,7 +14,7 @@
#include <QtGui/private/qgenericunixeventdispatcher_p.h> #include <QtGui/private/qgenericunixeventdispatcher_p.h>
#include <QtGui/private/qgenericunixfontdatabase_p.h> #include <QtGui/private/qgenericunixfontdatabase_p.h>
#include <QtGui/private/qgenericunixthemes_p.h> #include <QtGui/private/qgenericunixthemes_p.h>
#include <QtGui/private/qgenericunixservices_p.h> #include <qpa/qplatformservices.h>
#include <QtFbSupport/private/qfbvthandler_p.h> #include <QtFbSupport/private/qfbvthandler_p.h>
@ -195,7 +195,7 @@ QPlatformFontDatabase *QVkKhrDisplayIntegration::fontDatabase() const
QPlatformServices *QVkKhrDisplayIntegration::services() const QPlatformServices *QVkKhrDisplayIntegration::services() const
{ {
if (!m_services) if (!m_services)
m_services = new QGenericUnixServices; m_services = new QPlatformServices;
return m_services; return m_services;
} }