forked from qt-creator/qt-creator
Merge remote-tracking branch 'origin/2.8'
Conflicts: src/plugins/cpptools/cppmodelmanager.cpp Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
This commit is contained in:
@@ -377,10 +377,8 @@ bool CMakeProject::parseCMakeLists()
|
||||
adder.maybeAdd(file);
|
||||
|
||||
pinfo.appendProjectPart(part);
|
||||
modelmanager->updateProjectInfo(pinfo);
|
||||
m_codeModelFuture.cancel();
|
||||
m_codeModelFuture = modelmanager->updateSourceFiles(m_files,
|
||||
CppTools::CppModelManagerInterface::ForcedProgressNotification);
|
||||
m_codeModelFuture = modelmanager->updateProjectInfo(pinfo);
|
||||
|
||||
setProjectLanguage(ProjectExplorer::Constants::LANG_CXX, !part->files.isEmpty());
|
||||
}
|
||||
|
Reference in New Issue
Block a user