Make QWaylandsurface::output a property

Change-Id: I2c82466b0e3842da901449d7978683922331d05e

3 files changed, 4 insertions, 0 deletions

diff --git a/src/compositor/compositor_api/qwaylandquicksurface.cpp b/src/compositor/compositor_api/qwaylandquicksurface.cpp
index 9504a2f8a..6acd1f200 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.cpp
+++ b/src/compositor/compositor_api/qwaylandquicksurface.cpp
@@ -166,6 +166,7 @@ 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()
diff --git a/src/compositor/compositor_api/qwaylandquicksurface.h b/src/compositor/compositor_api/qwaylandquicksurface.h
index ef2de1f7d..ed18de71e 100644
--- a/src/compositor/compositor_api/qwaylandquicksurface.h
+++ b/src/compositor/compositor_api/qwaylandquicksurface.h
@@ -84,6 +84,7 @@ private:
     void updateTexture();
     void invalidateTexture();
 
+    void onOutputChanged(QWaylandOutput *newOutput, QWaylandOutput *oldOutput);
 };
 
 QT_END_NAMESPACE
diff --git a/src/compositor/compositor_api/qwaylandsurface.h b/src/compositor/compositor_api/qwaylandsurface.h
index 5366ed610..883a21f8c 100644
--- a/src/compositor/compositor_api/qwaylandsurface.h
+++ b/src/compositor/compositor_api/qwaylandsurface.h
@@ -125,6 +125,7 @@ class Q_COMPOSITOR_EXPORT QWaylandSurface : public QObject
     Q_PROPERTY(QWindow::Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged)
     Q_PROPERTY(QWaylandSurface *transientParent READ transientParent)
     Q_PROPERTY(QPointF transientOffset READ transientOffset)
+    Q_PROPERTY(QWaylandOutput *output READ output NOTIFY outputChanged)
 
     Q_ENUMS(WindowFlag WindowType)
     Q_FLAGS(WindowFlag WindowFlags)
@@ -252,6 +253,7 @@ Q_SIGNALS:
     void pong();
     void surfaceDestroyed();
     void shellViewCreated();
+    void outputChanged(QWaylandOutput *newOutput, QWaylandOutput *oldOutput);
 
     void configure(bool hasBuffer);
     void redraw();