SubPresentationSettings and QmlStream

It is now possible to define QML subpresentation contents in-line inside
a SubPresentationSettings/QmlStream element inside the Studio3D.

Task-number: QT3DS-1487
Change-Id: I31665d939eb0e1c804c7ce54febe7df475e9ccba
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/runtime/api/q3dswidget.cpp b/src/runtime/api/q3dswidget.cpp
index 01463ba..8fe224d 100644
--- a/src/runtime/api/q3dswidget.cpp
+++ b/src/runtime/api/q3dswidget.cpp
@@ -245,7 +245,7 @@ void Q3DSWidgetPrivate::createEngine()
     QObject::connect(engine, &Q3DSEngine::presentationLoaded, q, &Q3DSWidget::presentationLoaded);
 
     QString err;
-    sourceLoaded = engine->setSource(fn, &err);
+    sourceLoaded = engine->setSource(fn, &err, inlineQmlSubPresentations);
     if (sourceLoaded) {
         if (!error.isEmpty()) {
             error.clear();
@@ -285,7 +285,9 @@ void Q3DSWidgetPrivate::destroyEngine()
     }
 }
 
-void Q3DSWidgetPrivate::handlePresentationSource(const QUrl &newSource, SourceFlags flags)
+void Q3DSWidgetPrivate::handlePresentationSource(const QUrl &newSource,
+                                                 SourceFlags flags,
+                                                 const QVector<Q3DSInlineQmlSubPresentation *> &inlineSubPres)
 {
     if (newSource == source)
         return;
@@ -295,6 +297,7 @@ void Q3DSWidgetPrivate::handlePresentationSource(const QUrl &newSource, SourceFl
 
     source = newSource;
     sourceFlags = flags;
+    inlineQmlSubPresentations = inlineSubPres;
 
     needsInit = true;
     q_ptr->update();