From 7bc8dd18a3f9a81f11ad993bb6b3219ddb6af56f Mon Sep 17 00:00:00 2001
From: Christian Kamm <christian.d.kamm@nokia.com>
Date: Wed, 31 Aug 2011 08:43:17 +0200
Subject: [PATCH] QmlJS: Ensure the C++ model manager is available before using
 it.

Change-Id: I0cc4e59505a6a5baa585e3748fdf174805d661b1
Reviewed-on: http://codereview.qt.nokia.com/3913
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
---
 src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
index 357c366667a..786e23d83ac 100644
--- a/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
+++ b/src/plugins/qmljstools/qmljsfindexportedcpptypes.cpp
@@ -524,9 +524,11 @@ QList<LanguageUtils::FakeMetaObject::ConstPtr> FindExportedCppTypes::operator()(
 
     FindExportsVisitor finder(document);
     QList<ExportedQmlType> exports = finder();
-    CppModelManagerInterface::instance()->setExtraDiagnostics(
-                document->fileName(), CppModelManagerInterface::ExportedQmlTypesDiagnostic,
-                finder.messages());
+    if (CppModelManagerInterface *cppModelManager = CppModelManagerInterface::instance()) {
+        cppModelManager->setExtraDiagnostics(
+                    document->fileName(), CppModelManagerInterface::ExportedQmlTypesDiagnostic,
+                    finder.messages());
+    }
     if (exports.isEmpty())
         return noResults;