Merge remote-tracking branch 'origin/4.1'

Change-Id: Ie96fa53a88bcd06fa688a579c1d84aaf6f5e905f

1 files changed, 4 insertions, 1 deletions

diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
index a919087fea..bdd6e6eeab 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
@@ -1321,7 +1321,10 @@ void ModelManagerInterface::updateCppQmlTypes(QFutureInterface<void> &interface,
         if (!scan) {
             hasNewInfo = newData.remove(fileName) > 0 || hasNewInfo;
             foreach (const QString &file, newDeclarations[fileName]) {
-                finder(snapshot.document(file));
+                CPlusPlus::Document::Ptr doc = snapshot.document(file);
+                if (doc.isNull())
+                    continue;
+                finder(doc);
                 hasNewInfo = rescanExports(file, finder, newData) || hasNewInfo;
             }
             continue;