summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/qmljscheck.cpp
diff options
context:
space:
mode:
authorMarco Benelli <marco.benelli@qt.io>2017-03-16 17:13:46 +0100
committerMarco Benelli <marco.benelli@qt.io>2017-03-23 07:50:26 +0000
commit61d30a20ce5086badd19c6cc6696387290d6f642 (patch)
treed00997b92edd2e5787125796170d3f495b43c13e /src/libs/qmljs/qmljscheck.cpp
parentaa87ee72ec4a74345afed5096ac5b418b09bfd5e (diff)
downloadqt-creator-61d30a20ce5086badd19c6cc6696387290d6f642.tar.gz
QmlJs: sync qmljs parser
The last version of the grammar contains some constructs that the code model needs to know. Task-number: QTCREATORBUG-17842 Change-Id: I6250f96431acc05b19f3fd1b6cc268a07485cf0f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/libs/qmljs/qmljscheck.cpp')
-rw-r--r--src/libs/qmljs/qmljscheck.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 2b07dd1c66..66774a43f3 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -1045,9 +1045,8 @@ bool Check::visit(UiArrayBinding *ast)
bool Check::visit(UiPublicMember *ast)
{
if (ast->type == UiPublicMember::Property) {
- // check if the member type is valid
- if (!ast->memberType.isEmpty()) {
- const QStringRef name = ast->memberType;
+ if (ast->isValid()) {
+ const QStringRef name = ast->memberTypeName();
if (!name.isEmpty() && name.at(0).isLower()) {
const QString nameS = name.toString();
if (!isValidBuiltinPropertyType(nameS))