diff options
| author | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-04-21 08:10:08 +0200 |
|---|---|---|
| committer | Thomas Hartmann <thomas.hartmann@qt.io> | 2020-04-21 09:43:11 +0000 |
| commit | 74ffff63eb9210daf52921e33768a902679864a1 (patch) | |
| tree | 54e047c95a15ddb11a5e0e26f92937625857c930 | |
| parent | 0c94ab724a0a300ddd8b1fd5380ea1f609549658 (diff) | |
QmlDesigner: Allow setting state property
This has to be blocked only for the root item.
Task-number: QDS-1979
Change-Id: Ia05255468623fe715e3f7172e2f058a70629b783
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp index d061cdfc5d..f697052575 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp @@ -611,8 +611,8 @@ void QuickItemNodeInstance::setPropertyVariant(const PropertyName &name, const Q if (ignoredProperties().contains(name)) return; - if (name == "state") - return; // states are only set by us + if (name == "state" && isRootNodeInstance()) + return; // states on the root item are only set by us if (name == "height") { m_height = value.toDouble(); @@ -649,8 +649,8 @@ void QuickItemNodeInstance::setPropertyBinding(const PropertyName &name, const Q if (ignoredProperties().contains(name)) return; - if (name == "state") - return; // states are only set by us + if (name == "state" && isRootNodeInstance()) + return; // states on the root item are only set by us if (name.startsWith("anchors.") && isRootNodeInstance()) return; |