forked from qt-creator/qt-creator
Rename a few more ToolChain items to Toolchain
Change-Id: I78e12e6923242fcb72cdde6284185574b8792fc6 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user