From 44f4395879ec9464c0a6dd3a7635fad05ad14118 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@theqtcompany.com>
Date: Mon, 11 Apr 2016 12:51:21 +0200
Subject: Simplify ShellSurfaceItem creation

Use onShellSurfaceCreated instead of onCreateShellSurface.

A QWaylandWlShellSurface is no longer created in
QWaylandWlShellSurfaceItem::componentComplete

Change-Id: I7a0dbbacddc17ab32ed0e4d16e717fcefb221947
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Reviewed-by: Erik Larsson <erik@ortogonal.com>
---
 examples/wayland/multi-output/qml/main.qml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'examples/wayland/multi-output/qml')

diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml
index 9e11d3613..ccb3d418b 100644
--- a/examples/wayland/multi-output/qml/main.qml
+++ b/examples/wayland/multi-output/qml/main.qml
@@ -85,10 +85,9 @@ WaylandCompositor {
         WlShell {
             id: defaultShell
 
-            onCreateShellSurface: {
-                var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } );
-                item.shellSurface.initialize(defaultShell, surface, resource);
-                surface.activated.connect(item.raise);
+            onShellSurfaceCreated: {
+                var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
+                item.surface.activated.connect(item.raise);
             }
 
             Component.onCompleted: {
-- 
cgit v1.2.3