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

Don't needlessly call updateProjectInfo()

Browse Source 
Should not be necessary when nothing changed in the project info. This
also fixes a problem where include file scanning happened twice after
saving a pro file.

Reviewed-by: Roberto Raggi
This commit is contained in:
Thorbjørn Lindeijer
2009-10-26 15:31:43 +01:00
parent fe9b4458c6
commit cd3435a983
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/cpptools/cppmodelmanager.cpp
View File

@@ -331,9 +331,8 @@ void CppPreprocessor::resetEnvironment()
bool CppPreprocessor::includeFile(const QString &absoluteFilePath, QString *result)
{
if (absoluteFilePath.isEmpty() || m_included.contains(absoluteFilePath)) {
if (absoluteFilePath.isEmpty() || m_included.contains(absoluteFilePath))
return true;
}
if (m_workingCopy.contains(absoluteFilePath)) {
m_included.insert(absoluteFilePath);

2
src/plugins/qt4projectmanager/qt4project.cpp
View File

@@ -698,7 +698,7 @@ void Qt4Project::updateCodeModel()
pinfo.includePaths == allIncludePaths &&
pinfo.frameworkPaths == allFrameworkPaths &&
pinfo.sourceFiles == files) {
modelmanager->updateProjectInfo(pinfo);
// Nothing to update...
} else {
if (pinfo.defines != predefinedMacros ||
pinfo.includePaths != allIncludePaths ||