Merge branch '5.9' into 5.10

Conflicts:
	.qmake.conf
	src/animation/backend/handle_types_p.h
	src/extras/defaults/qtexturematerial.h
	src/render/backend/entity_p.h
	src/render/backend/handle_types_p.h
	src/render/backend/renderview.cpp
	src/render/io/scenemanager.cpp

Change-Id: Ic145062cc98360e9067fd60f0992c7a6b51e41bb

1 files changed, 4 insertions, 2 deletions

diff --git a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
index b99f6ae75..21f58e56d 100644
--- a/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
+++ b/src/quick3d/quick3d/items/quick3dnodeinstantiator.cpp
@@ -135,7 +135,8 @@ void Quick3DNodeInstantiatorPrivate::regenerate()
     }
 
     for (int i = 0; i < m_instanceModel->count(); i++) {
-        QObject *object = m_instanceModel->object(i, m_async);
+        QObject *object = m_instanceModel->object(i, m_async ?
+            QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested);
         // If the item was already created we won't get a createdItem
         if (object)
             _q_createdItem(i, object);
@@ -202,7 +203,8 @@ void Quick3DNodeInstantiatorPrivate::_q_modelUpdated(const QQmlChangeSet &change
             m_objects = m_objects.mid(0, index) + movedObjects + m_objects.mid(index);
         } else for (int i = 0; i < insert.count; ++i) {
             int modelIndex = index + i;
-            QObject *obj = m_instanceModel->object(modelIndex, m_async);
+            QObject *obj = m_instanceModel->object(modelIndex, m_async ?
+                QQmlIncubator::Asynchronous : QQmlIncubator::AsynchronousIfNested);
             if (obj)
                 _q_createdItem(modelIndex, obj);
         }