diff options
| author | Tobias Hunger <tobias.hunger@qt.io> | 2016-07-12 16:27:45 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2016-07-14 15:34:06 +0000 |
| commit | cb14fb0d715f22b32fb9880fd26e20715fcdc5a7 (patch) | |
| tree | 9abb67bb500505de5c813aba8d6b92a6793a4847 /src/plugins/qmakeprojectmanager/makestep.cpp | |
| parent | ce9ca1f0ef4af4695e6c57983fc89a8bbc49976d (diff) | |
| download | qt-creator-cb14fb0d715f22b32fb9880fd26e20715fcdc5a7.tar.gz | |
Kits: Save several ToolChains per kit
BREAKS BACKWARD COMPATIBILITY OF TOOLCHAIN SETTINGS!
* Convert old ToolChainKitInformation to new version
* Store several toolchains in one kit (one per language)
Change-Id: Ia59a2ad067c57971ec34ce9b2e43758344443755
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/makestep.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/makestep.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qmakeprojectmanager/makestep.cpp b/src/plugins/qmakeprojectmanager/makestep.cpp index 4a1e77e91a..b204926bf5 100644 --- a/src/plugins/qmakeprojectmanager/makestep.cpp +++ b/src/plugins/qmakeprojectmanager/makestep.cpp @@ -113,7 +113,7 @@ QString MakeStep::effectiveMakeCommand() const QString makeCmd = m_makeCmd; if (makeCmd.isEmpty()) { QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); - ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit()); + ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), ToolChain::Language::Cxx); if (bc && tc) makeCmd = tc->makeCommand(bc->environment()); @@ -133,7 +133,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"); @@ -163,7 +163,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()); @@ -392,7 +392,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()); |