From 58bd043e2722e7670008fb180faf982294221d4c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Thu, 17 May 2018 10:26:10 +0200 Subject: 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 --- src/plugins/qmakeprojectmanager/qmakemakestep.cpp | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/plugins/qmakeprojectmanager/qmakemakestep.cpp') 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 @@ -69,8 +69,6 @@ QmakeBuildConfiguration *QmakeMakeStep::qmakeBuildConfiguration() const bool QmakeMakeStep::init(QList &earlierSteps) { QmakeBuildConfiguration *bc = qmakeBuildConfiguration(); - if (!bc) - bc = qobject_cast(target()->activeBuildConfiguration()); if (!bc) emit addTask(Task::buildConfigurationMissingTask()); -- cgit v1.2.3