diff options
author | Paul Olav Tvete <paul.tvete@qt.io> | 2016-06-30 12:14:14 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@qt.io> | 2016-07-12 07:45:47 +0000 |
commit | 887f64448e49aa5539ad3cc23a2bac4e8c63648d (patch) | |
tree | 00a0a45465a832086faa23c2125a50a916d3596b /examples/wayland/multi-output | |
parent | 48e241740974ca1b8ba7d654958c423ca9ec9e0e (diff) |
Compositor: make the extensions property list optional
Extensions will now automatically add themselves to their parent
if they are not inside an extensions [ ... ] array.
Change-Id: I26c7f7c2ee023595eb4cd2496dd56e212f05329c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com>
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'examples/wayland/multi-output')
-rw-r--r-- | examples/wayland/multi-output/qml/main.qml | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml index 6a1483bca..18fbd4604 100644 --- a/examples/wayland/multi-output/qml/main.qml +++ b/examples/wayland/multi-output/qml/main.qml @@ -81,16 +81,14 @@ WaylandCompositor { } } - extensions: [ - WlShell { - id: defaultShell + WlShell { + id: defaultShell - onShellSurfaceCreated: { - var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } ); - item.surface.activated.connect(item.raise); - } + onShellSurfaceCreated: { + var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } ); + item.surface.activated.connect(item.raise); } - ] + } onCreateSurface: { var surface = surfaceComponent.createObject(comp, { } ); |