From 45e4bf73ec3cfcbdcd0e43fd45df1c2439bf6df7 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 9 Feb 2017 17:01:25 +0100 Subject: [PATCH] QmlDesigner: Fix expression parser for node hints 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 --- src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp index af54f08b1f0..71a77789b59 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodehints.cpp @@ -68,6 +68,11 @@ static QVariant evaluateExpression(const QString &expression, const ModelNode &m s_jsObject->setModelNode(modelNode); s_jsObject->setOtherNode(otherNode); + + QJSValue value = s_qJSEngine->evaluate(expression); + + if (value.isError()) + return expression; return s_qJSEngine->evaluate(expression).toVariant(); }