From b66d93c6b827ef2d194916c68f1f64fe874d5163 Mon Sep 17 00:00:00 2001
From: Ilya Fedin <fedin-ilja2010@ya.ru>
Date: Wed, 29 Mar 2023 21:22:46 +0400
Subject: Client: let QWaylandClientExtension work before platform integration
 is assigned

Task-number: QTBUG-102457
Pick-to: 6.5
Change-Id: Ia47478a4fbf45ba96fd73c6a1a53c2b844aa41b4
Reviewed-by: David Edmundson <davidedmundson@kde.org>
---
 src/client/global/qwaylandclientextension.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/client/global')

diff --git a/src/client/global/qwaylandclientextension.cpp b/src/client/global/qwaylandclientextension.cpp
index ca0954f78..b2783088b 100644
--- a/src/client/global/qwaylandclientextension.cpp
+++ b/src/client/global/qwaylandclientextension.cpp
@@ -6,10 +6,6 @@
 #include "qwaylandclientextension_p.h"
 #include <QtWaylandClient/private/qwaylanddisplay_p.h>
 #include <QtWaylandClient/private/qwaylandintegration_p.h>
-#include <QtGui/QGuiApplication>
-#include <QtGui/qpa/qplatformnativeinterface.h>
-#include <QtGui/private/qguiapplication_p.h>
-#include <QtCore/QDebug>
 
 QT_BEGIN_NAMESPACE
 
@@ -19,12 +15,9 @@ QWaylandClientExtensionPrivate::QWaylandClientExtensionPrivate()
 {
     // Keep the possibility to use a custom waylandIntegration as a plugin,
     // but also add the possibility to run it as a QML component.
-    waylandIntegration = static_cast<QtWaylandClient::QWaylandIntegration *>(QGuiApplicationPrivate::platformIntegration());
+    waylandIntegration = QtWaylandClient::QWaylandIntegration::instance();
     if (!waylandIntegration)
         waylandIntegration = new QtWaylandClient::QWaylandIntegration();
-
-    if (!waylandIntegration->nativeInterface()->nativeResourceForIntegration("wl_display"))
-        qWarning() << "This application requires a Wayland platform plugin";
 }
 
 void QWaylandClientExtensionPrivate::globalAdded(const RegistryGlobal &global)
-- 
cgit v1.2.3