Merge remote-tracking branch 'origin/4.9'

Change-Id: If4e8f52fc94c4e5fd9ec69c9000436d4ded913ff
This commit is contained in:
Orgad Shaneh
2019-02-15 13:42:44 +02:00
164 changed files with 7476 additions and 1069 deletions

View File

@@ -322,10 +322,12 @@ protected:
bool visit(AST::UiPublicMember *node) override
{
if (node->memberType->name == _name){
const ObjectValue * tVal = _context->lookupType(_doc.data(), QStringList(_name));
if (tVal == _typeValue)
_usages.append(node->typeToken);
if (UiQualifiedId *memberType = node->memberType) {
if (memberType->name == _name) {
const ObjectValue * tVal = _context->lookupType(_doc.data(), QStringList(_name));
if (tVal == _typeValue)
_usages.append(node->typeToken);
}
}
if (AST::cast<Block *>(node->statement)) {
_builder.push(node);