diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-25 13:18:31 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-25 13:18:31 +0200 |
| commit | 6896546ba5a6ae59416fe4f527294ba731235218 (patch) | |
| tree | b5b5c8b554f6dcdf391459d996100dbb265e55d1 /src/plugins/qt4projectmanager/qt4project.cpp | |
| parent | e2ce17ef00218af3db35118b036ebf19834b86e8 (diff) | |
| parent | 1dd9a54ab63d267268b6262b11c7b0189370f174 (diff) | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
src/plugins/cpptools/cppmodelmanager.cpp
Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
Diffstat (limited to 'src/plugins/qt4projectmanager/qt4project.cpp')
| -rw-r--r-- | src/plugins/qt4projectmanager/qt4project.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp index 3ea6828eb1..23e7b406c5 100644 --- a/src/plugins/qt4projectmanager/qt4project.cpp +++ b/src/plugins/qt4projectmanager/qt4project.cpp @@ -602,9 +602,7 @@ void Qt4Project::updateCppCodeModel() setProjectLanguage(ProjectExplorer::Constants::LANG_CXX, !allFiles.isEmpty()); - modelmanager->updateProjectInfo(pinfo); - m_codeModelFuture = modelmanager->updateSourceFiles(allFiles, - CppTools::CppModelManagerInterface::ForcedProgressNotification); + m_codeModelFuture = modelmanager->updateProjectInfo(pinfo); } void Qt4Project::updateQmlJSCodeModel() |