From 990fef9ec80c84def8efd55565a78518ecaa3767 Mon Sep 17 00:00:00 2001
From: David Redondo <qt@david-redondo.de>
Date: Wed, 12 Oct 2022 09:01:07 +0200
Subject: Implement QNativeInterface::Private::QWaylandScreen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I2f5cc638f33fe0d884146342516efa7ce8474478
Task-number: QTBUG-94729
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
---
 src/client/qwaylandscreen_p.h | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/client/qwaylandscreen_p.h b/src/client/qwaylandscreen_p.h
index 836dd0392..4499f0eef 100644
--- a/src/client/qwaylandscreen_p.h
+++ b/src/client/qwaylandscreen_p.h
@@ -16,6 +16,7 @@
 //
 
 #include <qpa/qplatformscreen.h>
+#include <qpa/qplatformscreen_p.h>
 #include <QtWaylandClient/qtwaylandclientglobal.h>
 
 #include <QtWaylandClient/private/qwayland-wayland.h>
@@ -34,7 +35,10 @@ public:
     QWaylandXdgOutputManagerV1(QWaylandDisplay *display, uint id, uint version);
 };
 
-class Q_WAYLANDCLIENT_EXPORT QWaylandScreen : public QPlatformScreen, QtWayland::wl_output, QtWayland::zxdg_output_v1
+class Q_WAYLANDCLIENT_EXPORT QWaylandScreen : public QPlatformScreen,
+                                              QtWayland::wl_output,
+                                              QtWayland::zxdg_output_v1,
+                                              public QNativeInterface::Private::QWaylandScreen
 {
 public:
     QWaylandScreen(QWaylandDisplay *waylandDisplay, int version, uint32_t id);
@@ -70,7 +74,10 @@ public:
 #endif
 
     uint32_t outputId() const { return m_outputId; }
-    ::wl_output *output() { return QtWayland::wl_output::object(); }
+    ::wl_output *output() const override
+    {
+        return const_cast<::wl_output *>(QtWayland::wl_output::object());
+    }
 
     static QWaylandScreen *waylandScreenFromWindow(QWindow *window);
     static QWaylandScreen *fromWlOutput(::wl_output *output);
-- 
cgit v1.2.3