diff options
author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-08-08 11:44:06 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-08-11 13:44:53 +0200 |
commit | bfdffd2a7d280659d2e0651cace0a4983a68785b (patch) | |
tree | 59d8b8def1e3cb0145fdc2c9db2e4f2ce66f29bb /share | |
parent | 29fa5d4a3f0353c3faf903ec74c029356f9bba20 (diff) |
QmlDesigner.NodeInstances: Check expressions
I do not see any reason to set an expression that contains a
code block.
Change-Id: I74960a6bac741db46d86e33299e8b1669e781e65
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'share')
-rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp index cd074e63a9..307feedd72 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp @@ -91,6 +91,14 @@ static bool isPropertyBlackListed(const QmlDesigner::PropertyName &propertyName) return false; } +static bool isSimpleExpression(const QString &expression) +{ + if (expression.startsWith(QStringLiteral("{"))) + return false; + + return true; +} + namespace QmlDesigner { namespace Internal { @@ -512,6 +520,9 @@ void ObjectNodeInstance::setPropertyBinding(const PropertyName &name, const QStr if (ignoredProperties().contains(name)) return; + if (!isSimpleExpression(expression)) + return; + QQmlProperty property(object(), name, context()); if (!property.isValid()) |