From 0334d4886b67dc9fe7393fdb04d636dc44e8f492 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 12 May 2022 17:10:09 +0300 Subject: QmlDesigner: Fix puppet crash when property animation has no target Fixes: QDS-6935 Change-Id: Ib6dae3a6c39a12e9e62bd494d5a27917d7f97048 Reviewed-by: Reviewed-by: Mahmoud Badri --- .../qtcreator/qml/qmlpuppet/qml2puppet/instances/nodeinstanceserver.cpp | 2 +- .../qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.cpp | 2 +- 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(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(a); - if (panim) + if (panim && panim->target()) panim->target()->setProperty(qPrintable(baseProperty(panim->property())), animationDefaultValue(i)); i++; } -- cgit v1.2.3