forked from qt-creator/qt-creator
ProjectExplorer: Rename ToolChain to Toolchain
Change-Id: Ibb520f14ff3e2a6147ca5d419b9351c50c141063 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
@@ -148,7 +148,7 @@ bool IosBuildStep::init()
|
||||
if (!AbstractProcessStep::init())
|
||||
return false;
|
||||
|
||||
ToolChain *tc = ToolChainKitAspect::cxxToolChain(kit());
|
||||
Toolchain *tc = ToolChainKitAspect::cxxToolChain(kit());
|
||||
if (!tc) {
|
||||
emit addTask(Task::compilerMissingTask());
|
||||
emitFaultyConfigurationMessage();
|
||||
@@ -195,7 +195,7 @@ QStringList IosBuildStep::defaultArguments() const
|
||||
{
|
||||
QStringList res;
|
||||
Kit *kit = target()->kit();
|
||||
ToolChain *tc = ToolChainKitAspect::cxxToolChain(kit);
|
||||
Toolchain *tc = ToolChainKitAspect::cxxToolChain(kit);
|
||||
switch (buildConfiguration()->buildType()) {
|
||||
case BuildConfiguration::Debug :
|
||||
res << "-configuration" << "Debug";
|
||||
|
||||
@@ -101,7 +101,7 @@ static bool isSimulatorDeviceId(const Id &id)
|
||||
static QList<GccToolChain *> clangToolChains(const Toolchains &toolChains)
|
||||
{
|
||||
QList<GccToolChain *> clangToolChains;
|
||||
for (ToolChain *toolChain : toolChains)
|
||||
for (Toolchain *toolChain : toolChains)
|
||||
if (toolChain->typeId() == ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID)
|
||||
clangToolChains.append(static_cast<GccToolChain *>(toolChain));
|
||||
return clangToolChains;
|
||||
@@ -593,8 +593,8 @@ Toolchains IosToolchainFactory::autoDetect(const ToolchainDetector &detector) co
|
||||
if (!toolChain) {
|
||||
toolChain = new GccToolChain(ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID,
|
||||
GccToolChain::Clang);
|
||||
toolChain->setPriority(ToolChain::PriorityHigh);
|
||||
toolChain->setDetection(ToolChain::AutoDetection);
|
||||
toolChain->setPriority(Toolchain::PriorityHigh);
|
||||
toolChain->setDetection(Toolchain::AutoDetection);
|
||||
toolChain->setLanguage(l);
|
||||
toolChain->setDisplayName(target.name);
|
||||
toolChain->setPlatformCodeGenFlags(target.backendFlags);
|
||||
|
||||
Reference in New Issue
Block a user