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>

2 files changed, 7 insertions, 0 deletions

diff --git a/src/compositor/global/qwaylandcompositorextension.cpp b/src/compositor/global/qwaylandcompositorextension.cpp
index ddfd25837..6c7577ffc 100644
--- a/src/compositor/global/qwaylandcompositorextension.cpp
+++ b/src/compositor/global/qwaylandcompositorextension.cpp
@@ -96,6 +96,12 @@ void QWaylandCompositorExtension::initialize()
         return;
     }
 
+    if (!d->extension_container && parent()) {
+        QWaylandObject *parentObj = qobject_cast<QWaylandObject*>(parent());
+        if (parentObj)
+            setExtensionContainer(parentObj);
+    }
+
     if (!d->extension_container) {
         qWarning() << "QWaylandCompositorExtension:" << extensionInterface()->name << "requests to initialize with no extension container set";
         return;
diff --git a/src/compositor/global/qwaylandcompositorextension.h b/src/compositor/global/qwaylandcompositorextension.h
index 0ba54c882..d666b4f2a 100644
--- a/src/compositor/global/qwaylandcompositorextension.h
+++ b/src/compositor/global/qwaylandcompositorextension.h
@@ -52,6 +52,7 @@ class QWaylandCompositorExtensionPrivate;
 
 class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandObject : public QObject
 {
+    Q_OBJECT
 public:
     virtual ~QWaylandObject();