Rework how we manage extensions

Change-Id: If2cbf096e7419bc1bda007d5167ce39d1a5d50ae

2 files changed, 7 insertions, 4 deletions

diff --git a/examples/wayland/multi-output/qml/Chrome.qml b/examples/wayland/multi-output/qml/Chrome.qml
index 0f82a44ee..27160f15a 100644
--- a/examples/wayland/multi-output/qml/Chrome.qml
+++ b/examples/wayland/multi-output/qml/Chrome.qml
@@ -43,8 +43,11 @@ import QtWayland.Compositor 1.0
 
 Item {
     id: rootChrome
-    x: clampXPos()
-    y: clampYPos()
+    //x: clampXPos()
+    //y: clampYPos()
+    x: chrome.requestedXPosition
+    y: chrome.requestedYPosition
+
     width: childrenRect.width
     height: childrenRect.height
 
diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml
index 6b83c39a0..fbde0a730 100644
--- a/examples/wayland/multi-output/qml/main.qml
+++ b/examples/wayland/multi-output/qml/main.qml
@@ -62,11 +62,11 @@ WaylandCompositor {
 
     function addScreen() {
         var screen = screenComponent.createObject(0, { "compositor" : compositor } );
-        var output = compositor.addOutput(screen);
+        var output = compositor.primaryOutputSpace.addOutputWindow(screen);
         output.automaticFrameCallbacks = true;
     }
 
     onSurfaceCreated: {
-       var chrome = chromeComponent.createObject(surface.outputWindow.surfacesArea, { "surface" : surface } );
+       var chrome = chromeComponent.createObject(surface.primaryOutput.window.surfacesArea, { "surface" : surface } );
     }
 }