Make it possible to add the default shell from qml

Change-Id: I00f01a42b98dbe76851800b87a725fcca16f824e

1 files changed, 26 insertions, 0 deletions

diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
index 13c32fae7..977b8a4a5 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
@@ -49,6 +49,7 @@ QT_BEGIN_NAMESPACE
 QWaylandQuickCompositor::QWaylandQuickCompositor(QObject *parent)
     : QWaylandCompositor(parent)
     , m_initializeLegazyQmlNames(true)
+    , m_exposeDefaultShell(false)
 {
 }
 
@@ -79,9 +80,23 @@ bool QWaylandQuickCompositor::initializeLegazyQmlNames() const
 
 void QWaylandQuickCompositor::setInitializeLegazyQmlNames(bool init)
 {
+    if (isCreated())
+        qWarning() << Q_FUNC_INFO << "modifying initializeLegazyQmlNames after the compositor is created is not supported";
     m_initializeLegazyQmlNames = init;
 }
 
+bool QWaylandQuickCompositor::exposeDefaultShell() const
+{
+    return m_exposeDefaultShell;
+}
+
+void QWaylandQuickCompositor::setExposeDefaultShell(bool defaultShell)
+{
+    if (isCreated())
+        qWarning() << Q_FUNC_INFO << "modifying exposeDefaultShell after the compositor is created is not supported";
+    m_exposeDefaultShell = defaultShell;
+}
+
 QWaylandSurfaceView *QWaylandQuickCompositor::createView(QWaylandSurface *surf)
 {
     return new QWaylandSurfaceItem(static_cast<QWaylandQuickSurface *>(surf));
@@ -103,4 +118,15 @@ QWaylandSurface *QWaylandQuickCompositor::createSurface(QWaylandClient *client,
     return new QWaylandQuickSurface(client->client(), id, version, this);
 }
 
+void QWaylandQuickCompositor::classBegin()
+{
+}
+
+void QWaylandQuickCompositor::componentComplete()
+{
+    if (m_exposeDefaultShell)
+        addDefaultShell();
+
+}
+
 QT_END_NAMESPACE