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

Rename a few more ToolChain items to Toolchain

Browse Source 
Change-Id: I78e12e6923242fcb72cdde6284185574b8792fc6
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2024-01-22 17:46:28 +01:00
parent d7c1fe129f
commit d0d0d3b83a
27 changed files with 439 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/mesonprojectmanager/mesonprojectparser.cpp
View File

@@ -254,8 +254,8 @@ void MesonProjectParser::update(const QFuture<MesonProjectParser::ParserData *>
RawProjectPart MesonProjectParser::buildRawPart(
const Target &target,
const Target::SourceGroup &sources,
const Toolchain *cxxToolChain,
const Toolchain *cToolChain)
const Toolchain *cxxToolchain,
const Toolchain *cToolchain)
{
RawProjectPart part;
part.setDisplayName(target.name);
@@ -266,24 +266,24 @@ RawProjectPart MesonProjectParser::buildRawPart(
part.setIncludePaths(toAbsolutePath(m_buildDir, flags.includePaths));
part.setProjectFileLocation(target.definedIn);
if (sources.language == "cpp")
part.setFlagsForCxx({cxxToolChain, flags.args, {}});
part.setFlagsForCxx({cxxToolchain, flags.args, {}});
else if (sources.language == "c")
part.setFlagsForC({cToolChain, flags.args, {}});
part.setFlagsForC({cToolchain, flags.args, {}});
part.setQtVersion(m_qtVersion);
return part;
}
RawProjectParts MesonProjectParser::buildProjectParts(
const Toolchain *cxxToolChain, const Toolchain *cToolChain)
const Toolchain *cxxToolchain, const Toolchain *cToolchain)
{
RawProjectParts parts;
for_each_source_group(m_parserResult.targets,
[&parts,
&cxxToolChain,
&cToolChain,
&cxxToolchain,
&cToolchain,
this](const Target &target, const Target::SourceGroup &sourceList) {
parts.push_back(
buildRawPart(target, sourceList, cxxToolChain, cToolChain));
buildRawPart(target, sourceList, cxxToolchain, cToolchain));
});
return parts;
}

8
src/plugins/mesonprojectmanager/mesonprojectparser.h
View File

@@ -57,8 +57,8 @@ public:
QList<ProjectExplorer::BuildTargetInfo> appsTargets() const;
ProjectExplorer::RawProjectParts buildProjectParts(
const ProjectExplorer::Toolchain *cxxToolChain,
const ProjectExplorer::Toolchain *cToolChain);
const ProjectExplorer::Toolchain *cxxToolchain,
const ProjectExplorer::Toolchain *cToolchain);
void setEnvironment(const Utils::Environment &environment) { m_env = environment; }
@@ -78,8 +78,8 @@ private:
void update(const QFuture<ParserData *> &data);
ProjectExplorer::RawProjectPart buildRawPart(const Target &target,
const Target::SourceGroup &sources,
const ProjectExplorer::Toolchain *cxxToolChain,
const ProjectExplorer::Toolchain *cToolChain);
const ProjectExplorer::Toolchain *cxxToolchain,
const ProjectExplorer::Toolchain *cToolchain);
MesonOutputParser m_outputParser;
Utils::Environment m_env;