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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Conflicts:
	src/plugins/cpptools/cppmodelmanager.cpp

Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
This commit is contained in:
Oswald Buddenhagen
2013-07-25 13:18:31 +02:00
parent e2ce17ef00 1dd9a54ab6
commit 6896546ba5
66 changed files with 836 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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());
}