Remove output from QWaylandSurface

It is the views that belong to outputs.

This leads to a couple of interesting cases with enter and leave events,
but the implementation says you will get enter events for the first view
of a surface entering an output, and for the last view being removed
from an output.

Also to throttle a surface, there has to be 1 surface which takes care
of this. This is because if multiple views throttle, then the client
might render to quick.

Change-Id: If4bba380fd4d7f506fd769606cbdea4ce58b908d

2 files changed, 2 insertions, 1 deletions

diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index e80c6a5ee..18fd45fa1 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -65,6 +65,6 @@ WaylandCompositor {
     }
 
     onSurfaceCreated: {
-        var chrome = chromeComponent.createObject(surface.primaryOutputWindow.surfacesArea, { "surface" : surface } );
+        var chrome = chromeComponent.createObject(primaryOutputSpace.primaryOutput.window.surfacesArea, { "surface" : surface } );
     }
 }
diff --git a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
index bb8d3463a..22d097b6b 100644
--- a/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
+++ b/examples/wayland/qwindow-compositor/qwindowcompositor.cpp
@@ -256,6 +256,7 @@ void QWindowCompositor::onShellSurfaceCreated(QWaylandSurface *surface, QtWaylan
 {
     SurfaceView *newView = new SurfaceView();
     newView->setSurface(surface);
+    newView->setOutput(output(m_window));
     shellSurface->setView(newView);
     m_renderScheduler.start(0);
 }