diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index 147852fe3251bdc3f8f2737880ee84eba14e2c2d..ae6ed1b335476c0df24ce536f70c92baa6363bd2 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()) diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp index 97184c979250eb80014ec59a693490fe11db3b6d..59b152220189aa5c925b71fe1ab2e5319b86db6a 100644 --- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp @@ -256,7 +256,8 @@ public: bool isAttachedProperty = false; if (! propertyName.isEmpty() && propertyName[0].isUpper()) { isAttachedProperty = true; - scopeObjects += m_context->scopeChain().qmlTypes; + if (const Interpreter::ObjectValue *qmlTypes = m_context->scopeChain().qmlTypes) + scopeObjects += qmlTypes; } if (scopeObjects.isEmpty()) diff --git a/src/plugins/qmljseditor/qmljscodecompletion.cpp b/src/plugins/qmljseditor/qmljscodecompletion.cpp index c85d3e44b3fb5d2d3b03569109358f8c562704ee..423e8253175b2a010bf4ec1e20514d200f5363db 100644 --- a/src/plugins/qmljseditor/qmljscodecompletion.cpp +++ b/src/plugins/qmljseditor/qmljscodecompletion.cpp @@ -730,7 +730,8 @@ int CodeCompletion::startCompletion(TextEditor::ITextEditable *editor) m_completions.append(idPropertyCompletion); addCompletionsPropertyLhs(enumerateProperties(qmlScopeType), symbolIcon, PropertyOrder); - addCompletions(enumerateProperties(context->scopeChain().qmlTypes), symbolIcon, TypeOrder); + if (const Interpreter::ObjectValue *qmlTypes = context->scopeChain().qmlTypes) + addCompletions(enumerateProperties(qmlTypes), symbolIcon, TypeOrder); if (ScopeBuilder::isPropertyChangesObject(context, qmlScopeType) && context->scopeChain().qmlScopeObjects.size() == 2) {