summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@qt.io>2022-05-12 17:10:09 +0300
committerMiikka Heikkinen <miikka.heikkinen@qt.io>2022-05-13 07:32:50 +0000
commit0334d4886b67dc9fe7393fdb04d636dc44e8f492 (patch)
tree58f6492b5d0eb6f14efe1b7449bf718da1d539c3
parente703ee97d6c9949fac3928655e7ea42b4f5c30b9 (diff)
downloadqt-creator-0334d4886b67dc9fe7393fdb04d636dc44e8f492.tar.gz
QmlDesigner: Fix puppet crash when property animation has no target
Fixes: QDS-6935 Change-Id: Ib6dae3a6c39a12e9e62bd494d5a27917d7f97048 Reviewed-by: <github-actions-qt-creator@cristianadam.eu> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp2
-rw-r--r--share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
index a6e7e259e2..8400c3d447 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp
@@ -1610,7 +1610,7 @@ void NodeInstanceServer::addAnimation(QQuickAbstractAnimation *animation)
m_animations.push_back(animation);
QQuickPropertyAnimation *panim = qobject_cast<QQuickPropertyAnimation *>(animation);
- if (panim) {
+ if (panim && panim->target()) {
QObject *target = panim->target();
QString property = panim->property();
QVariant value = target->property(qPrintable(baseProperty(property)));
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
index acc7894a96..a57df6bd9f 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp
@@ -534,7 +534,7 @@ void Qt5InformationNodeInstanceServer::handleParticleSystemDeselected()
for (auto a : anim) {
a->stop();
QQuickPropertyAnimation *panim = qobject_cast<QQuickPropertyAnimation *>(a);
- if (panim)
+ if (panim && panim->target())
panim->target()->setProperty(qPrintable(baseProperty(panim->property())), animationDefaultValue(i));
i++;
}