diff options
| author | Marco Benelli <marco.benelli@qt.io> | 2017-03-16 17:13:46 +0100 |
|---|---|---|
| committer | Marco Benelli <marco.benelli@qt.io> | 2017-03-23 07:50:26 +0000 |
| commit | 61d30a20ce5086badd19c6cc6696387290d6f642 (patch) | |
| tree | d00997b92edd2e5787125796170d3f495b43c13e /src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | |
| parent | aa87ee72ec4a74345afed5096ac5b418b09bfd5e (diff) | |
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/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp')
| -rw-r--r-- | src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp index 17b1cf0862..10605c3445 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp @@ -84,8 +84,8 @@ static TypeName resolveTypeName(const ASTPropertyReference *ref, const ContextPt { TypeName type = "unknown"; - if (!ref->ast()->memberType.isEmpty()) { - type = ref->ast()->memberType.toUtf8(); + if (ref->ast()->isValid()) { + type = ref->ast()->memberTypeName().toUtf8(); if (type == "alias") { const Value *value = context->lookupReference(ref); |