Add WaylandOutputWindow item

and add a convenience getter on the QWaylandQuickSurface to retrieve the
window. This is because the window typically in qml will have
additional properties which we want to retrieve. Instead of doing
surface.output.window we can now do surface.outputWindow which looks
cleaner

Change-Id: Ia3007583a8a0e8e01444cb3f8819fbc651be14ab

1 files changed, 5 insertions, 1 deletions

diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp
index 6acd1f200..a55569da9 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.cpp
+++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp
@@ -166,7 +166,6 @@ QWaylandQuickSurface::QWaylandQuickSurface(wl_client *client, quint32 id, int ve
     connect(this, &QWaylandSurface::windowPropertyChanged, d->windowPropertyMap, &QQmlPropertyMap::insert);
     connect(d->windowPropertyMap, &QQmlPropertyMap::valueChanged, this, &QWaylandSurface::setWindowProperty);
     connect(this, &QWaylandSurface::shellViewCreated, this, &QWaylandQuickSurface::shellViewCreated);
-    connect(this, &QWaylandSurface::outputChanged, this, &QWaylandQuickSurface::onOutputChanged);
 }
 
 QWaylandQuickSurface::~QWaylandQuickSurface()
@@ -207,6 +206,11 @@ QWaylandSurfaceItem *QWaylandQuickSurface::shellView() const
     return static_cast<QWaylandSurfaceItem *>(QWaylandSurface::shellView());
 }
 
+QWindow *QWaylandQuickSurface::outputWindow() const
+{
+    return output() ? output()->window() : Q_NULLPTR;
+}
+
 bool QWaylandQuickSurface::event(QEvent *e)
 {
     if (e->type() == static_cast<QEvent::Type>(QWaylandSurfaceLeaveEvent::WaylandSurfaceLeave)) {