feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix expression parser for node hints

Browse Source 
Literals seem to evaluate to an error.
If there is an error we just return the expression
which is likely a literal.

Change-Id: I38204573a31dd85de0c906954415f48ce5bace31
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Thomas Hartmann
2017-02-09 17:01:25 +01:00
parent f6691a8743
commit 45e4bf73ec
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp
View File

@@ -68,6 +68,11 @@ static QVariant evaluateExpression(const QString &expression, const ModelNode &m
s_jsObject->setModelNode(modelNode); s_jsObject->setModelNode(modelNode);
s_jsObject->setOtherNode(otherNode); s_jsObject->setOtherNode(otherNode);
QJSValue value = s_qJSEngine->evaluate(expression);
if (value.isError())
return expression;
return s_qJSEngine->evaluate(expression).toVariant(); return s_qJSEngine->evaluate(expression).toVariant();
} }