Move the output from QWaylandSurface to the QWaylandSurfaceView

and add a property called primaryOutput on the QWaylandSurface.
Also add some bookkeeping in QtWayland::Output so it knows what surfaces
and views it currently holds, sending the enter and leave events
automatically.

Change-Id: Ib6efbc6f8157657fb4451b751bba1cb5345b7906

1 files changed, 1 insertions, 1 deletions

diff --git a/src/imports/compositor/WaylandSurfaceChrome.qml b/src/imports/compositor/WaylandSurfaceChrome.qml
index 69525d87e..7f9ae8025 100644
--- a/src/imports/compositor/WaylandSurfaceChrome.qml
+++ b/src/imports/compositor/WaylandSurfaceChrome.qml
@@ -60,7 +60,6 @@ Item {
         }
 
         onSurfaceDestroyed: {
-            chrome.surfaceDestroyed();
             if (automaticDestroyOnSurfaceDestroy)
                 chrome.destroy();
         }
@@ -78,6 +77,7 @@ Item {
             chrome.visible = Qt.binding(function() { return view.visible; });
             chrome.requestedXPosition = Qt.binding(function() { return view.requestedXPosition; });
             chrome.requestedYPosition = Qt.binding(function() { return view.requestedYPosition; });
+            view.surfaceDestroyed.connect(function() { chrome.surfaceDestroyed(); });
         } else {
             chrome.visible = false;
         }