From dc5a0e3e5a2a620b9f2bcac6ec6873080c498bc9 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@digia.com>
Date: Fri, 21 Jun 2013 15:04:14 +0200
Subject: [PATCH] Project managers: Force "Parsing" notification
...so parsing progress will also be reported for projects consisting of
only one source file.
Task-number: QTCREATORBUG-9597
Change-Id: If35a00b6f949258d64921f144919269fa0c81d36
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
---
src/plugins/autotoolsprojectmanager/autotoolsproject.cpp | 3 ++-
src/plugins/cmakeprojectmanager/cmakeproject.cpp | 3 ++-
src/plugins/genericprojectmanager/genericproject.cpp | 3 ++-
src/plugins/qbsprojectmanager/qbsproject.cpp | 3 ++-
src/plugins/qt4projectmanager/qt4project.cpp | 3 ++-
5 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index 0c1b52993fa..82f5c6c9fde 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -433,7 +433,8 @@ void AutotoolsProject::updateCppCodeModel()
pinfo.appendProjectPart(part);
modelManager->updateProjectInfo(pinfo);
- modelManager->updateSourceFiles(m_files);
+ modelManager->updateSourceFiles(m_files,
+ CppTools::CppModelManagerInterface::ForcedProgressNotification);
setProjectLanguage(ProjectExplorer::Constants::LANG_CXX, !part->files.isEmpty());
}
diff --git a/src/plugins/cmakeprojectmanager/cmakeproject.cpp b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
index 35f928c73df..fa278b2a1d6 100644
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -391,7 +391,8 @@ bool CMakeProject::parseCMakeLists()
pinfo.appendProjectPart(part);
modelmanager->updateProjectInfo(pinfo);
m_codeModelFuture.cancel();
- m_codeModelFuture = modelmanager->updateSourceFiles(m_files);
+ m_codeModelFuture = modelmanager->updateSourceFiles(m_files,
+ CppTools::CppModelManagerInterface::ForcedProgressNotification);
setProjectLanguage(ProjectExplorer::Constants::LANG_CXX, !part->files.isEmpty());
}
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp
index 326e25c3786..afa10b6b59c 100644
--- a/src/plugins/genericprojectmanager/genericproject.cpp
+++ b/src/plugins/genericprojectmanager/genericproject.cpp
@@ -286,7 +286,8 @@ void GenericProject::refresh(RefreshOptions options)
setProjectLanguage(ProjectExplorer::Constants::LANG_CXX, !part->files.isEmpty());
modelManager->updateProjectInfo(pinfo);
- m_codeModelFuture = modelManager->updateSourceFiles(filesToUpdate);
+ m_codeModelFuture = modelManager->updateSourceFiles(filesToUpdate,
+ CppTools::CppModelManagerInterface::ForcedProgressNotification);
}
}
diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp
index 7dda3e3cf47..766e0f8d190 100644
--- a/src/plugins/qbsprojectmanager/qbsproject.cpp
+++ b/src/plugins/qbsprojectmanager/qbsproject.cpp
@@ -597,7 +597,8 @@ void QbsProject::updateCppCodeModel(const qbs::ProjectData &prj)
// Register update the code model:
modelmanager->updateProjectInfo(pinfo);
- m_codeModelFuture = modelmanager->updateSourceFiles(allFiles);
+ m_codeModelFuture = modelmanager->updateSourceFiles(allFiles,
+ CppTools::CppModelManagerInterface::ForcedProgressNotification);
}
void QbsProject::updateQmlJsCodeModel(const qbs::ProjectData &prj)
diff --git a/src/plugins/qt4projectmanager/qt4project.cpp b/src/plugins/qt4projectmanager/qt4project.cpp
index aa811840313..4ba2a96919a 100644
--- a/src/plugins/qt4projectmanager/qt4project.cpp
+++ b/src/plugins/qt4projectmanager/qt4project.cpp
@@ -615,7 +615,8 @@ void Qt4Project::updateCppCodeModel()
setProjectLanguage(ProjectExplorer::Constants::LANG_CXX, !allFiles.isEmpty());
modelmanager->updateProjectInfo(pinfo);
- m_codeModelFuture = modelmanager->updateSourceFiles(allFiles);
+ m_codeModelFuture = modelmanager->updateSourceFiles(allFiles,
+ CppTools::CppModelManagerInterface::ForcedProgressNotification);
}
void Qt4Project::updateQmlJSCodeModel()
--
GitLab