feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'gerrit/4.9' into 4.10

Browse Source 
Change-Id: I033d6baa40af45ae1eb6ed82827ff51213c832f5
This commit is contained in:
Eike Ziller
2019-06-13 13:53:02 +02:00
parent 58451e630d 66dc831398
commit 39477594da
6 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cmakeprojectmanager/cmakeproject.cpp
View File

@@ -358,9 +358,8 @@ void CMakeProject::updateProjectData(CMakeBuildConfiguration *bc)
void CMakeProject::updateQmlJSCodeModel()
{
QmlJS::ModelManagerInterface *modelManager = QmlJS::ModelManagerInterface::instance();
QTC_ASSERT(modelManager, return);
if (!activeTarget() || !activeTarget()->activeBuildConfiguration())
if (!modelManager || !activeTarget() || !activeTarget()->activeBuildConfiguration())
return;
QmlJS::ModelManagerInterface::ProjectInfo projectInfo =