feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Use Repeater3D instead of Object3D in component complete check

Browse Source 
Do not use QQuick3DObject when disallowing recursive component complete
check so that the animations get added to the instance server.

Fixes: QDS-5731
Change-Id: Iff8e39f74d68b312b66d68adaf6ab79d625f88f8
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Antti Määttä
2021-12-09 08:58:08 +02:00
committed by Thomas Hartmann
parent b289f5d13a
commit dfbac3161b
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
View File

@@ -63,6 +63,7 @@
#ifdef QUICK3D_MODULE #ifdef QUICK3D_MODULE
#include <private/qquick3dobject_p.h> #include <private/qquick3dobject_p.h>
#include <private/qquick3drepeater_p.h>
#endif #endif
namespace QmlDesigner { namespace QmlDesigner {
@@ -379,7 +380,7 @@ void doComponentCompleteRecursive(QObject *object, NodeInstanceServer *nodeInsta
if (item && DesignerSupport::isComponentComplete(item)) if (item && DesignerSupport::isComponentComplete(item))
return; return;
#ifdef QUICK3D_MODULE #ifdef QUICK3D_MODULE
auto obj3d = qobject_cast<QQuick3DObject *>(object); auto obj3d = qobject_cast<QQuick3DRepeater *>(object);
if (obj3d && QQuick3DObjectPrivate::get(obj3d)->componentComplete) if (obj3d && QQuick3DObjectPrivate::get(obj3d)->componentComplete)
return; return;
#endif #endif