forked from qt-creator/qt-creator
Project: Rename Project::activeBuildEnvironment to Project::activeParseEnvironment
This is used for parsing the project only, so reflect that in the name. Not all projects have build configurations, so the old name did not make too much sense for what this has been used for. Eventually this code should move into the BuildSystem. Change-Id: Iff766150b5fe370f2912b0b3b15348b1c1fad5b5 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -253,5 +253,5 @@ void AutotoolsProject::updateCppCodeModel()
|
|||||||
rpp.setMacros(m_makefileParserThread->macros());
|
rpp.setMacros(m_makefileParserThread->macros());
|
||||||
rpp.setFiles(m_files);
|
rpp.setFiles(m_files);
|
||||||
|
|
||||||
m_cppCodeModelUpdater->update({this, kitInfo, activeBuildEnvironment(), {rpp}});
|
m_cppCodeModelUpdater->update({this, kitInfo, activeParseEnvironment(), {rpp}});
|
||||||
}
|
}
|
||||||
|
@@ -390,7 +390,7 @@ void CompilationDatabaseProject::buildTreeAndProjectParts()
|
|||||||
|
|
||||||
setRootProjectNode(std::move(root));
|
setRootProjectNode(std::move(root));
|
||||||
|
|
||||||
m_cppCodeModelUpdater->update({this, kitInfo, activeBuildEnvironment(), rpps});
|
m_cppCodeModelUpdater->update({this, kitInfo, activeParseEnvironment(), rpps});
|
||||||
}
|
}
|
||||||
|
|
||||||
CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FilePath &projectFile)
|
CompilationDatabaseProject::CompilationDatabaseProject(const Utils::FilePath &projectFile)
|
||||||
|
@@ -520,7 +520,7 @@ void GenericProject::refreshCppCodeModel()
|
|||||||
rpp.setFlagsForC({nullptr, m_cflags});
|
rpp.setFlagsForC({nullptr, m_cflags});
|
||||||
rpp.setFiles(m_files);
|
rpp.setFiles(m_files);
|
||||||
|
|
||||||
m_cppCodeModelUpdater->update({this, kitInfo, activeBuildEnvironment(), {rpp}});
|
m_cppCodeModelUpdater->update({this, kitInfo, activeParseEnvironment(), {rpp}});
|
||||||
}
|
}
|
||||||
|
|
||||||
void GenericProject::updateDeploymentData()
|
void GenericProject::updateDeploymentData()
|
||||||
|
@@ -860,7 +860,7 @@ Task Project::createProjectTask(Task::TaskType type, const QString &description)
|
|||||||
return Task(type, description, Utils::FilePath(), -1, Core::Id());
|
return Task(type, description, Utils::FilePath(), -1, Core::Id());
|
||||||
}
|
}
|
||||||
|
|
||||||
Utils::Environment Project::activeBuildEnvironment() const
|
Utils::Environment Project::activeParseEnvironment() const
|
||||||
{
|
{
|
||||||
const BuildConfiguration * const buildConfiguration = activeTarget()
|
const BuildConfiguration * const buildConfiguration = activeTarget()
|
||||||
? activeTarget()->activeBuildConfiguration() : nullptr;
|
? activeTarget()->activeBuildConfiguration() : nullptr;
|
||||||
|
@@ -294,7 +294,7 @@ protected:
|
|||||||
static ProjectExplorer::Task createProjectTask(ProjectExplorer::Task::TaskType type,
|
static ProjectExplorer::Task createProjectTask(ProjectExplorer::Task::TaskType type,
|
||||||
const QString &description);
|
const QString &description);
|
||||||
|
|
||||||
Utils::Environment activeBuildEnvironment() const;
|
Utils::Environment activeParseEnvironment() const;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// Helper methods to manage parsing state and signalling
|
// Helper methods to manage parsing state and signalling
|
||||||
|
@@ -1023,7 +1023,7 @@ void QbsProject::updateCppCodeModel()
|
|||||||
}
|
}
|
||||||
|
|
||||||
CppTools::GeneratedCodeModelSupport::update(m_extraCompilers);
|
CppTools::GeneratedCodeModelSupport::update(m_extraCompilers);
|
||||||
m_cppCodeModelUpdater->update({this, kitInfo, activeBuildEnvironment(), rpps});
|
m_cppCodeModelUpdater->update({this, kitInfo, activeParseEnvironment(), rpps});
|
||||||
}
|
}
|
||||||
|
|
||||||
void QbsProject::updateQmlJsCodeModel()
|
void QbsProject::updateQmlJsCodeModel()
|
||||||
|
@@ -288,7 +288,7 @@ void QmakeProject::updateCppCodeModel()
|
|||||||
}
|
}
|
||||||
|
|
||||||
CppTools::GeneratedCodeModelSupport::update(generators);
|
CppTools::GeneratedCodeModelSupport::update(generators);
|
||||||
m_cppCodeModelUpdater->update({this, kitInfo, activeBuildEnvironment(), rpps});
|
m_cppCodeModelUpdater->update({this, kitInfo, activeParseEnvironment(), rpps});
|
||||||
}
|
}
|
||||||
|
|
||||||
void QmakeProject::updateQmlJSCodeModel()
|
void QmakeProject::updateQmlJSCodeModel()
|
||||||
|
Reference in New Issue
Block a user