summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntti Määttä <antti.maatta@qt.io>2021-12-09 08:58:08 +0200
committerThomas Hartmann <thomas.hartmann@qt.io>2021-12-10 10:24:20 +0000
commitdfbac3161b71ec6ed838ee0f8feb7cf86abc38f6 (patch)
treea1adf5a64cea14f337c2b478bfa5c925888e60e8
parentb289f5d13acf3123bd44cc82e6121ee02b6cdff4 (diff)
downloadqt-creator-dfbac3161b71ec6ed838ee0f8feb7cf86abc38f6.tar.gz
Use Repeater3D instead of Object3D in component complete check
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>
-rw-r--r--share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
index 03b28bbf65..1171bdf004 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlprivategate/qmlprivategate_56.cpp
@@ -63,6 +63,7 @@
#ifdef QUICK3D_MODULE
#include <private/qquick3dobject_p.h>
+#include <private/qquick3drepeater_p.h>
#endif
namespace QmlDesigner {
@@ -379,7 +380,7 @@ void doComponentCompleteRecursive(QObject *object, NodeInstanceServer *nodeInsta
if (item && DesignerSupport::isComponentComplete(item))
return;
#ifdef QUICK3D_MODULE
- auto obj3d = qobject_cast<QQuick3DObject *>(object);
+ auto obj3d = qobject_cast<QQuick3DRepeater *>(object);
if (obj3d && QQuick3DObjectPrivate::get(obj3d)->componentComplete)
return;
#endif