summaryrefslogtreecommitdiffstats
path: root/examples/wayland/multi-output
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@theqtcompany.com>2016-04-11 12:51:21 +0200
committerJohan Helsing <johan.helsing@theqtcompany.com>2016-04-11 15:49:02 +0000
commit44f4395879ec9464c0a6dd3a7635fad05ad14118 (patch)
treea65a7eda1c4aac7101eedd42787c0483e442101b /examples/wayland/multi-output
parentf2e42b438d221ab007e9d3a0cbac1d34634b66e6 (diff)
Simplify ShellSurfaceItem creationv5.7.0-beta1
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>
Diffstat (limited to 'examples/wayland/multi-output')
-rw-r--r--examples/wayland/multi-output/qml/main.qml7
1 files changed, 3 insertions, 4 deletions
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: {