From a6d16f85c45893bb54b8b26d72305d95b9b95a3c Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 10 Nov 2016 11:38:02 +0100 Subject: [PATCH] QmlDesigner: Check for parent is not required States actually have a parent. Change-Id: Iaee31dec4d969c2f84224a2d93796d67f39fda77 Reviewed-by: Tim Jenssen --- .../qml2puppet/instances/qmlstatenodeinstance.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.cpp index cde625de50f..5b320814594 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.cpp @@ -72,9 +72,8 @@ void QmlStateNodeInstance::deactivateState() void QmlStateNodeInstance::setPropertyVariant(const PropertyName &name, const QVariant &value) { - bool hasParent = parent(); bool isStateOfTheRootModelNode = parentInstance() && parentInstance()->isRootNodeInstance(); - if (name == "when" && (!hasParent || isStateOfTheRootModelNode)) + if (name == "when" && (isStateOfTheRootModelNode)) return; ObjectNodeInstance::setPropertyVariant(name, value); @@ -82,9 +81,9 @@ void QmlStateNodeInstance::setPropertyVariant(const PropertyName &name, const QV void QmlStateNodeInstance::setPropertyBinding(const PropertyName &name, const QString &expression) { - bool hasParent = parent(); bool isStateOfTheRootModelNode = parentInstance() && parentInstance()->isRootNodeInstance(); - if (name == "when" && (!hasParent || isStateOfTheRootModelNode)) + + if (name == "when" && (isStateOfTheRootModelNode)) return; ObjectNodeInstance::setPropertyBinding(name, expression);