4 files changed, 13 insertions, 15 deletions
diff --git a/examples/wayland/multi-output/qml/GridScreen.qml b/examples/wayland/multi-output/qml/GridScreen.qml
index 6b1d574cd..3dab99d0a 100644
--- a/examples/wayland/multi-output/qml/GridScreen.qml
+++ b/examples/wayland/multi-output/qml/GridScreen.qml
@@ -73,7 +73,7 @@ WaylandOutput {
                     height: gridView.cellHeight
                     sizeFollowsSurface: false
                     inputEventsEnabled: false
-                    view.discardFrontBuffers: true
+                    allowDiscardFrontBuffer: true
                     MouseArea {
                         anchors.fill: parent
                         onClicked: item.surface.activated()
diff --git a/examples/wayland/multi-output/qml/ShellChrome.qml b/examples/wayland/multi-output/qml/ShellChrome.qml
index dac3eb096..709e83679 100644
--- a/examples/wayland/multi-output/qml/ShellChrome.qml
+++ b/examples/wayland/multi-output/qml/ShellChrome.qml
@@ -45,7 +45,7 @@ ShellSurfaceItem {
     id: rootChrome
 
     onSurfaceDestroyed: {
-        view.bufferLock = true;
+        bufferLocked = true;
         destroyAnimation.start();
     }
 
diff --git a/examples/wayland/multi-output/qml/ShellScreen.qml b/examples/wayland/multi-output/qml/ShellScreen.qml
index 77fbeb828..9a6122118 100644
--- a/examples/wayland/multi-output/qml/ShellScreen.qml
+++ b/examples/wayland/multi-output/qml/ShellScreen.qml
@@ -55,7 +55,7 @@ WaylandOutput {
             id: mouseTracker
             anchors.fill: parent
 
-            enableWSCursor: true
+            windowSystemCursorEnabled: true
             Image {
                 id: background
                 anchors.fill: parent
@@ -66,10 +66,10 @@ WaylandOutput {
             WaylandCursorItem {
                 id: cursor
                 inputEventsEnabled: false
-                x: mouseTracker.mouseX - hotspotX
-                y: mouseTracker.mouseY - hotspotY
+                x: mouseTracker.mouseX
+                y: mouseTracker.mouseY
 
-                inputDevice : output.compositor.defaultInputDevice
+                seat : output.compositor.defaultSeat
             }
         }
     }
diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml
index 6a1483bca..e8a30100d 100644
--- a/examples/wayland/multi-output/qml/main.qml
+++ b/examples/wayland/multi-output/qml/main.qml
@@ -81,18 +81,16 @@ WaylandCompositor {
         }
     }
 
-    extensions: [
-        WlShell {
-            id: defaultShell
+    WlShell {
+        id: defaultShell
 
-            onShellSurfaceCreated: {
-                var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
-                item.surface.activated.connect(item.raise);
-            }
+        onWlShellSurfaceCreated: {
+            var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
+            item.surface.activated.connect(item.raise);
         }
-    ]
+    }
 
-    onCreateSurface: {
+    onSurfaceRequested: {
         var surface = surfaceComponent.createObject(comp, { } );
         surface.initialize(comp, client, id, version);
     }