Changed QML reading in QML designer to use the interpreter for property types.

1 files changed, 6 insertions, 0 deletions

diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp
index f6eb31a3239..4e0fd13abe8 100644
--- a/src/libs/qmljs/qmljscheck.cpp
+++ b/src/libs/qmljs/qmljscheck.cpp
@@ -302,6 +302,9 @@ bool Check::visit(UiArrayBinding *ast)
     return true;
 }
 
+/// When something is changed here, also change ReadingContext::lookupProperty in
+/// texttomodelmerger.cpp
+/// ### Maybe put this into the context as a helper method.
 const Value *Check::checkScopeObjectMember(const UiQualifiedId *id)
 {
     QList<const ObjectValue *> scopeObjects = _context.scopeChain().qmlScopeObjects;
@@ -311,6 +314,9 @@ const Value *Check::checkScopeObjectMember(const UiQualifiedId *id)
     if (! id)
         return 0; // ### error?
 
+    if (! id->name) // possible after error recovery
+        return 0;
+
     QString propertyName = id->name->asString();
 
     if (propertyName == QLatin1String("id") && ! id->next)