diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-08-15 10:07:51 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-08-15 10:07:51 +0200 |
| commit | d8fd5292f17bd07d390500f5daa10b46d5573a49 (patch) | |
| tree | 24a004a722d7947bd6a354e20a5ad6b651c73073 /src/libs/qmljs/qmljscheck.cpp | |
| parent | e6a50fd44a68ccb61a852c4576817162a465c2ce (diff) | |
| parent | 885f8b53858b5c6158a0c6f2208c24cc042b9f38 (diff) | |
| download | qt-creator-d8fd5292f17bd07d390500f5daa10b46d5573a49.tar.gz | |
Merge remote-tracking branch 'origin/4.4'
Conflicts:
src/tools/clangbackend/ipcsource/clangiasyncjob.cpp
src/tools/clangbackend/ipcsource/clangjobrequest.cpp
src/tools/clangbackend/ipcsource/clangjobrequest.h
Change-Id: Ib8602530663813ade418f995dfd2a736908cfe75
Diffstat (limited to 'src/libs/qmljs/qmljscheck.cpp')
| -rw-r--r-- | src/libs/qmljs/qmljscheck.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 1076bd27c0..52180c4cc3 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -1781,6 +1781,9 @@ const Value *Check::checkScopeObjectMember(const UiQualifiedId *id) addMessage(ErrInvalidMember, idPart->identifierToken, propertyName, objectValue->className()); return 0; } + // resolve references + if (const Reference *ref = value->asReference()) + value = _context->lookupReference(ref); } return value; |