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

client: use QDesktopUnixServices instead of QGenericUnixServices

Browse Source 
Renamed in 3e29267df0e2f332290caad69e5bd5cfd61cf3da in qtbase.

Pick-to: 6.9
Change-Id: If857e206071226c2d0f6f42ce1c9b4d091b0bc63
Reviewed-by: Liang Qi <liang.qi@qt.io>
This commit is contained in:
Thiago Macieira 2025-01-22 10:23:44 -08:00 committed by Liang Qi
parent 71c4dab8d0
commit d8e205a003
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wayland/qwaylandplatformservices.cpp
View File

@ -26,7 +26,7 @@ bool QWaylandPlatformServices::openUrl(const QUrl &url)
windowManagerIntegration->openUrl(url); windowManagerIntegration->openUrl(url);
return true; return true;
} }
return QGenericUnixServices::openUrl(url); return QDesktopUnixServices::openUrl(url);
} }
bool QWaylandPlatformServices::openDocument(const QUrl &url) bool QWaylandPlatformServices::openDocument(const QUrl &url)
@ -35,7 +35,7 @@ bool QWaylandPlatformServices::openDocument(const QUrl &url)
windowManagerIntegration->openUrl(url); windowManagerIntegration->openUrl(url);
return true; return true;
} }
return QGenericUnixServices::openDocument(url); return QDesktopUnixServices::openDocument(url);
} }
QString QWaylandPlatformServices::portalWindowIdentifier(QWindow *window) QString QWaylandPlatformServices::portalWindowIdentifier(QWindow *window)

4
src/plugins/platforms/wayland/qwaylandplatformservices_p.h
View File

@ -16,7 +16,7 @@
// //
#include <QtCore/QMap> #include <QtCore/QMap>
#include <QtGui/private/qgenericunixservices_p.h> #include <QtGui/private/qdesktopunixservices_p.h>
#include <QtWaylandClient/private/qwayland-qt-windowmanager.h> #include <QtWaylandClient/private/qwayland-qt-windowmanager.h>
#include <QtWaylandClient/qtwaylandclientglobal.h> #include <QtWaylandClient/qtwaylandclientglobal.h>
@ -29,7 +29,7 @@ class QWaylandAppMenu;
class QWaylandDisplay; class QWaylandDisplay;
class QWaylandWindow; class QWaylandWindow;
class Q_WAYLANDCLIENT_EXPORT QWaylandPlatformServices : public QGenericUnixServices class Q_WAYLANDCLIENT_EXPORT QWaylandPlatformServices : public QDesktopUnixServices
{ {
public: public:
explicit QWaylandPlatformServices(QWaylandDisplay *waylandDisplay); explicit QWaylandPlatformServices(QWaylandDisplay *waylandDisplay);

2
src/plugins/platforms/wayland/qwaylandwindow.cpp
View File

@ -1065,7 +1065,7 @@ bool QWaylandWindow::createDecoration()
} }
if (targetKey.isEmpty()) { if (targetKey.isEmpty()) {
auto unixServices = dynamic_cast<QGenericUnixServices *>( auto unixServices = dynamic_cast<QDesktopUnixServices *>(
QGuiApplicationPrivate::platformIntegration()->services()); QGuiApplicationPrivate::platformIntegration()->services());
const QList<QByteArray> desktopNames = unixServices->desktopEnvironment().split(':'); const QList<QByteArray> desktopNames = unixServices->desktopEnvironment().split(':');
if (desktopNames.contains("GNOME")) { if (desktopNames.contains("GNOME")) {