summaryrefslogtreecommitdiff
path: root/src/plugins/qmakeprojectmanager/makestep.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/qmakeprojectmanager/makestep.cpp')
-rw-r--r--src/plugins/qmakeprojectmanager/makestep.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp
index 79f283cf6b..a824ddafac 100644
--- a/src/plugins/qmakeprojectmanager/makestep.cpp
+++ b/src/plugins/qmakeprojectmanager/makestep.cpp
@@ -115,7 +115,7 @@ QString MakeStep::effectiveMakeCommand() const
QmakeBuildConfiguration *bc = qmakeBuildConfiguration();
if (!bc)
bc = qobject_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration());
- ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
+ ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), ToolChain::Language::Cxx);
if (bc && tc)
makeCmd = tc->makeCommand(bc->environment());
@@ -135,7 +135,7 @@ QVariantMap MakeStep::toMap() const
QStringList MakeStep::automaticallyAddedArguments() const
{
- ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
+ ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), ToolChain::Language::Cxx);
if (!tc || tc->targetAbi().binaryFormat() == Abi::PEFormat)
return QStringList();
return QStringList() << QLatin1String("-w") << QLatin1String("-r");
@@ -165,7 +165,7 @@ bool MakeStep::init(QList<const BuildStep *> &earlierSteps)
if (!bc)
emit addTask(Task::buildConfigurationMissingTask());
- ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit());
+ ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), ToolChain::Language::Cxx);
if (!tc)
emit addTask(Task::compilerMissingTask());
@@ -260,7 +260,7 @@ bool MakeStep::init(QList<const BuildStep *> &earlierSteps)
pp->resolveAll();
setOutputParser(new ProjectExplorer::GnuMakeParser());
- if (tc && tc->targetAbi().os() == Abi::MacOS)
+ if (tc && tc->targetAbi().os() == Abi::DarwinOS)
appendOutputParser(new XcodebuildParser);
IOutputParser *parser = target()->kit()->createOutputParser();
if (parser)
@@ -394,7 +394,7 @@ MakeStepConfigWidget::~MakeStepConfigWidget()
void MakeStepConfigWidget::updateDetails()
{
ToolChain *tc
- = ToolChainKitInformation::toolChain(m_makeStep->target()->kit());
+ = ToolChainKitInformation::toolChain(m_makeStep->target()->kit(), ToolChain::Language::Cxx);
QmakeBuildConfiguration *bc = m_makeStep->qmakeBuildConfiguration();
if (!bc)
bc = qobject_cast<QmakeBuildConfiguration *>(m_makeStep->target()->activeBuildConfiguration());