Remove QWaylandShellIntegration::findGlobal

This is no longer necessary now that the recommended way of creating
custom shells is to use QWaylandShellIntegrationTemplate. This also
restores the old internal API in use by existing shells.

Task-number: QTBUG-94330
Change-Id: I0fa0ba0d928baa2edf5d68e879558081026436c8
Reviewed-by: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
Reviewed-by: David Edmundson <davidedmundson@kde.org>

1 files changed, 2 insertions, 20 deletions

diff --git a/src/plugins/shellintegration/qt-shell/qwaylandqtshellintegration.cpp b/src/plugins/shellintegration/qt-shell/qwaylandqtshellintegration.cpp
index 225ee61f..568599c6 100644
--- a/src/plugins/shellintegration/qt-shell/qwaylandqtshellintegration.cpp
+++ b/src/plugins/shellintegration/qt-shell/qwaylandqtshellintegration.cpp
@@ -56,31 +56,13 @@ QT_BEGIN_NAMESPACE
 namespace QtWaylandClient {
 
 QWaylandQtShellIntegration::QWaylandQtShellIntegration()
+    : QWaylandShellIntegrationTemplate(1)
 {
 }
 
-bool QWaylandQtShellIntegration::initialize()
-{
-    if (m_qtShell)
-        return true;
-    wl_registry *registry;
-    uint32_t id;
-    uint32_t version;
-    bool found = findGlobal(QLatin1String("zqt_shell_v1"), &registry, &id, &version);
-    if (!found) {
-        qCDebug(lcQpaWayland) << "Couldn't find global zqt_shell_v1 for qt-shell";
-        return false;
-    }
-    m_qtShell.reset(new QtWayland::zqt_shell_v1(registry, id, version));
-    return true;
-}
-
 QWaylandShellSurface *QWaylandQtShellIntegration::createShellSurface(QWaylandWindow *window)
 {
-    if (!m_qtShell)
-        return nullptr;
-
-    auto *surface = m_qtShell->surface_create(wlSurfaceForWindow(window));
+    auto *surface = surface_create(wlSurfaceForWindow(window));
     return new QWaylandQtSurface(surface, window);
 }