From cb81dbe08c80ebd7351d6d1466c69c577dc71141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20R=C3=B6ssler?= Date: Sun, 23 Oct 2016 22:49:25 +0200 Subject: [PATCH] fixed evaluation of properties named property --- src/api.js | 4 +++- tests/qml/Properties.qml | 1 + tests/qml/Properties.qml.json | 14 +++++++++++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/api.js b/src/api.js index 76c8ed7..dd1149f 100644 --- a/src/api.js +++ b/src/api.js @@ -276,7 +276,9 @@ function qmlweb_parse($TEXT, document_type, exigent_mode) { return qmlsignaldef(); } } else if (S.token.type == "name") { - if (S.token.value == "property" && (S.token.type == "name" || S.token.value == "var")) { + if (S.token.value == "property" && + S.token.type == "name" && + !is_token(peek(), "punc", ":")) { next(); return qmlpropdef(); } diff --git a/tests/qml/Properties.qml b/tests/qml/Properties.qml index 65abac3..5436ddd 100644 --- a/tests/qml/Properties.qml +++ b/tests/qml/Properties.qml @@ -5,6 +5,7 @@ Rectangle { height: 15 color: 'green' border.width: 2 + property: 'test' property bool flag property int integer; diff --git a/tests/qml/Properties.qml.json b/tests/qml/Properties.qml.json index bece1d1..06c0b7a 100644 --- a/tests/qml/Properties.qml.json +++ b/tests/qml/Properties.qml.json @@ -64,7 +64,19 @@ 2 ] ], - "2\n\n " + "2\n " + ], + [ + "qmlprop", + "property", + [ + "stat", + [ + "string", + "test" + ] + ], + "'test'\n\n " ], [ "qmlpropdef",