Make it optional to register the QWaylandQuick types to qml

Change-Id: Ic50e3516e435a354ad478349d9af86a5a112f5c7

1 files changed, 31 insertions, 4 deletions

diff --git a/src/compositor/compositor_api/qwaylandquickcompositor.cpp b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
index 3a8cc4c6b..13c32fae7 100644
--- a/src/compositor/compositor_api/qwaylandquickcompositor.cpp
+++ b/src/compositor/compositor_api/qwaylandquickcompositor.cpp
@@ -48,11 +48,38 @@ QT_BEGIN_NAMESPACE
 
 QWaylandQuickCompositor::QWaylandQuickCompositor(QObject *parent)
     : QWaylandCompositor(parent)
+    , m_initializeLegazyQmlNames(true)
 {
-    qmlRegisterUncreatableType<QWaylandSurfaceItem>("QtCompositor", 1, 0, "WaylandSurfaceItem", QObject::tr("Cannot create instance of WaylandSurfaceItem"));
-    qmlRegisterUncreatableType<QWaylandQuickSurface>("QtCompositor", 1, 0, "WaylandQuickSurface", QObject::tr("Cannot create instance of WaylandQuickSurface"));
-    qmlRegisterUncreatableType<QWaylandClient>("QtCompositor", 1, 0, "WaylandClient", QObject::tr("Cannot create instance of WaylandClient"));
-    qmlRegisterUncreatableType<QWaylandOutput>("QtCompositor", 1, 0, "WaylandOutput", QObject::tr("Cannot create instance of WaylandOutput"));
+}
+
+void QWaylandQuickCompositor::create()
+{
+    if (m_initializeLegazyQmlNames)
+        registerLegacyQmlNames();
+
+    QWaylandCompositor::create();
+}
+
+void QWaylandQuickCompositor::registerLegacyQmlNames()
+{
+    static bool initialized = false;
+    if (!initialized) {
+        qmlRegisterUncreatableType<QWaylandSurfaceItem>("QtCompositor", 1, 0, "WaylandSurfaceItem", QObject::tr("Cannot create instance of WaylandSurfaceItem"));
+        qmlRegisterUncreatableType<QWaylandQuickSurface>("QtCompositor", 1, 0, "WaylandQuickSurface", QObject::tr("Cannot create instance of WaylandQuickSurface"));
+        qmlRegisterUncreatableType<QWaylandClient>("QtCompositor", 1, 0, "WaylandClient", QObject::tr("Cannot create instance of WaylandClient"));
+        qmlRegisterUncreatableType<QWaylandOutput>("QtCompositor", 1, 0, "WaylandOutput", QObject::tr("Cannot create instance of WaylandOutput"));
+        initialized = true;
+    }
+}
+
+bool QWaylandQuickCompositor::initializeLegazyQmlNames() const
+{
+    return m_initializeLegazyQmlNames;
+}
+
+void QWaylandQuickCompositor::setInitializeLegazyQmlNames(bool init)
+{
+    m_initializeLegazyQmlNames = init;
 }
 
 QWaylandSurfaceView *QWaylandQuickCompositor::createView(QWaylandSurface *surf)