CppTools: Remove assertions for CppModelManager::instance()

It cannot return null.

Change-Id: I3ac5f33e7e02554edc8df067c7b85518e58c1fc2
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

1 files changed, 3 insertions, 9 deletions

diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
index fe70b0731e..97f46e74d4 100644
--- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp
+++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp
@@ -470,24 +470,18 @@ void QmakeProject::updateCppCodeModel()
     typedef CppTools::ProjectFile ProjectFile;
 
     Kit *k = 0;
-    QtSupport::BaseQtVersion *qtVersion = 0;
     if (Target *target = activeTarget())
         k = target->kit();
     else
         k = KitManager::defaultKit();
-    qtVersion = QtSupport::QtKitInformation::qtVersion(k);
-
-    CppTools::CppModelManager *modelmanager =
-        CppTools::CppModelManager::instance();
-
-    if (!modelmanager)
-        return;
 
+    CppTools::CppModelManager *modelmanager = CppTools::CppModelManager::instance();
     FindQmakeProFiles findQmakeProFiles;
     QList<QmakeProFileNode *> proFiles = findQmakeProFiles(rootProjectNode());
 
-    CppTools::ProjectInfo pinfo = CppTools::ProjectInfo(this);
+    CppTools::ProjectInfo pinfo(this);
 
+    QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k);
     ProjectPart::QtVersion qtVersionForPart = ProjectPart::NoQt;
     if (qtVersion) {
         if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))