summaryrefslogtreecommitdiff
path: root/src/libs/qmljs/qmljscheck.cpp
diff options
context:
space:
mode:
authorChristian Kamm <christian.d.kamm@nokia.com>2010-08-30 13:31:50 +0200
committerChristian Kamm <christian.d.kamm@nokia.com>2010-08-30 13:35:35 +0200
commit32bb7bffc052ea33925c58870a5f0f7333752e5a (patch)
tree7b427190998f15ad8203d0ed1c6edfdddba2c7fe /src/libs/qmljs/qmljscheck.cpp
parentbfad59df64afde2cbb6daa5bd67e971e642c4bbe (diff)
downloadqt-creator-32bb7bffc052ea33925c58870a5f0f7333752e5a.tar.gz
QmlJS: Add missing null checks before using scopeChain().qmlTypes.
Diffstat (limited to 'src/libs/qmljs/qmljscheck.cpp')
-rw-r--r--src/libs/qmljs/qmljscheck.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index 147852fe32..ae6ed1b335 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -309,7 +309,8 @@ const Value *Check::checkScopeObjectMember(const UiQualifiedId *id)
bool isAttachedProperty = false;
if (! propertyName.isEmpty() && propertyName[0].isUpper()) {
isAttachedProperty = true;
- scopeObjects += _context.scopeChain().qmlTypes;
+ if (const ObjectValue *qmlTypes = _context.scopeChain().qmlTypes)
+ scopeObjects += qmlTypes;
}
if (scopeObjects.isEmpty())