From d8e205a0030cb35d72bc50be748647caf79ca083 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Wed, 22 Jan 2025 10:23:44 -0800
Subject: [PATCH] client: use QDesktopUnixServices instead of
 QGenericUnixServices

Renamed in 3e29267df0e2f332290caad69e5bd5cfd61cf3da in qtbase.

Pick-to: 6.9
Change-Id: If857e206071226c2d0f6f42ce1c9b4d091b0bc63
Reviewed-by: Liang Qi <liang.qi@qt.io>
---
 src/plugins/platforms/wayland/qwaylandplatformservices.cpp | 4 ++--
 src/plugins/platforms/wayland/qwaylandplatformservices_p.h | 4 ++--
 src/plugins/platforms/wayland/qwaylandwindow.cpp           | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/plugins/platforms/wayland/qwaylandplatformservices.cpp b/src/plugins/platforms/wayland/qwaylandplatformservices.cpp
index e0eb690d792..74d8c2e2e3b 100644
--- a/src/plugins/platforms/wayland/qwaylandplatformservices.cpp
+++ b/src/plugins/platforms/wayland/qwaylandplatformservices.cpp
@@ -26,7 +26,7 @@ bool QWaylandPlatformServices::openUrl(const QUrl &url)
         windowManagerIntegration->openUrl(url);
         return true;
     }
-    return QGenericUnixServices::openUrl(url);
+    return QDesktopUnixServices::openUrl(url);
 }
 
 bool QWaylandPlatformServices::openDocument(const QUrl &url)
@@ -35,7 +35,7 @@ bool QWaylandPlatformServices::openDocument(const QUrl &url)
         windowManagerIntegration->openUrl(url);
         return true;
     }
-    return QGenericUnixServices::openDocument(url);
+    return QDesktopUnixServices::openDocument(url);
 }
 
 QString QWaylandPlatformServices::portalWindowIdentifier(QWindow *window)
diff --git a/src/plugins/platforms/wayland/qwaylandplatformservices_p.h b/src/plugins/platforms/wayland/qwaylandplatformservices_p.h
index f8b09ccab90..017d222843b 100644
--- a/src/plugins/platforms/wayland/qwaylandplatformservices_p.h
+++ b/src/plugins/platforms/wayland/qwaylandplatformservices_p.h
@@ -16,7 +16,7 @@
 //
 
 #include <QtCore/QMap>
-#include <QtGui/private/qgenericunixservices_p.h>
+#include <QtGui/private/qdesktopunixservices_p.h>
 
 #include <QtWaylandClient/private/qwayland-qt-windowmanager.h>
 #include <QtWaylandClient/qtwaylandclientglobal.h>
@@ -29,7 +29,7 @@ class QWaylandAppMenu;
 class QWaylandDisplay;
 class QWaylandWindow;
 
-class Q_WAYLANDCLIENT_EXPORT QWaylandPlatformServices : public QGenericUnixServices
+class Q_WAYLANDCLIENT_EXPORT QWaylandPlatformServices : public QDesktopUnixServices
 {
 public:
     explicit QWaylandPlatformServices(QWaylandDisplay *waylandDisplay);
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index 7b46ba22d54..54cddf6876e 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -1065,7 +1065,7 @@ bool QWaylandWindow::createDecoration()
             }
 
             if (targetKey.isEmpty()) {
-                auto unixServices = dynamic_cast<QGenericUnixServices *>(
+                auto unixServices = dynamic_cast<QDesktopUnixServices *>(
                     QGuiApplicationPrivate::platformIntegration()->services());
                 const QList<QByteArray> desktopNames = unixServices->desktopEnvironment().split(':');
                 if (desktopNames.contains("GNOME")) {