From 887f64448e49aa5539ad3cc23a2bac4e8c63648d Mon Sep 17 00:00:00 2001
From: Paul Olav Tvete <paul.tvete@qt.io>
Date: Thu, 30 Jun 2016 12:14:14 +0200
Subject: 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>
---
 examples/wayland/pure-qml/qml/main.qml | 48 +++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 24 deletions(-)

(limited to 'examples/wayland/pure-qml/qml')

diff --git a/examples/wayland/pure-qml/qml/main.qml b/examples/wayland/pure-qml/qml/main.qml
index 0d99275eb..4f331641b 100644
--- a/examples/wayland/pure-qml/qml/main.qml
+++ b/examples/wayland/pure-qml/qml/main.qml
@@ -62,34 +62,34 @@ WaylandCompositor {
         }
     }
 
-    extensions: [
-        QtWindowManager {
-            id: qtWindowManager
-            onShowIsFullScreenChanged: console.debug("Show is fullscreen hint for Qt applications:", showIsFullScreen)
-        },
-        WlShell {
-            onShellSurfaceCreated: {
-                chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
-            }
-        },
-        XdgShell {
-            property variant viewsBySurface: ({})
-            onXdgSurfaceCreated: {
-                var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": xdgSurface } );
-                viewsBySurface[xdgSurface.surface] = item;
-            }
-            onXdgPopupCreated: {
-                var parentView = viewsBySurface[xdgPopup.parentSurface];
-                chromeComponent.createObject(parentView, { "shellSurface": xdgPopup } );
-            }
-        },
-        TextInputManager {
+    QtWindowManager {
+        id: qtWindowManager
+        onShowIsFullScreenChanged: console.debug("Show is fullscreen hint for Qt applications:", showIsFullScreen)
+    }
+
+    WlShell {
+        onShellSurfaceCreated: {
+            chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": shellSurface } );
+        }
+    }
+
+    XdgShell {
+        property variant viewsBySurface: ({})
+        onXdgSurfaceCreated: {
+            var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "shellSurface": xdgSurface } );
+            viewsBySurface[xdgSurface.surface] = item;
         }
-    ]
+        onXdgPopupCreated: {
+            var parentView = viewsBySurface[xdgPopup.parentSurface];
+            chromeComponent.createObject(parentView, { "shellSurface": xdgPopup } );
+        }
+    }
+
+    TextInputManager {
+    }
 
     onCreateSurface: {
         var surface = surfaceComponent.createObject(comp, { } );
         surface.initialize(comp, client, id, version);
-
     }
 }
-- 
cgit v1.2.3