diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-05-17 10:26:10 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-05-22 12:18:36 +0000 |
| commit | 58bd043e2722e7670008fb180faf982294221d4c (patch) | |
| tree | b062e9e013ad02c0b769695d64d4655784bae7f5 /src/plugins/qmakeprojectmanager/qmakemakestep.cpp | |
| parent | d2a9e1b892456b0500bdc79ca749d2bdf02afab5 (diff) | |
Centralize retrieving the "parent" build configuration
If a step is part of a build configuration, that is used, but many steps
can be used as part of a deploy configuration.
In that case the active build configuration of the step's target must be
used, and that logic was duplicated many times.
Instead, let BuildStep::buildConfiguration take care of that logic. For
steps that are not offered for deploy configurations there is no
semantic difference, and for the others this removes code duplication.
Change-Id: I02f3bb50226590092cedcec02fce6fde9c7c6e63
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakemakestep.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakemakestep.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp index 43498a2c45..c853e5d614 100644 --- a/src/plugins/qmakeprojectmanager/qmakemakestep.cpp +++ b/src/plugins/qmakeprojectmanager/qmakemakestep.cpp @@ -70,8 +70,6 @@ bool QmakeMakeStep::init(QList<const BuildStep *> &earlierSteps) { QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); if (!bc) - bc = qobject_cast<QmakeBuildConfiguration *>(target()->activeBuildConfiguration()); - if (!bc) emit addTask(Task::buildConfigurationMissingTask()); ToolChain *tc = ToolChainKitInformation::toolChain(target()->kit(), ProjectExplorer::Constants::CXX_LANGUAGE_ID); |