aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/winrt/winrtpackagedeploymentstep.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-05-17 10:26:10 +0200
committerEike Ziller <eike.ziller@qt.io>2018-05-22 12:18:36 +0000
commit58bd043e2722e7670008fb180faf982294221d4c (patch)
treeb062e9e013ad02c0b769695d64d4655784bae7f5 /src/plugins/winrt/winrtpackagedeploymentstep.cpp
parentd2a9e1b892456b0500bdc79ca749d2bdf02afab5 (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/winrt/winrtpackagedeploymentstep.cpp')
-rw-r--r--src/plugins/winrt/winrtpackagedeploymentstep.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp
index 9d2710192d..050941e042 100644
--- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp
+++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp
@@ -95,7 +95,7 @@ bool WinRtPackageDeploymentStep::init(QList<const BuildStep *> &earlierSteps)
ProcessParameters *params = processParameters();
params->setCommand(QLatin1String("windeployqt.exe"));
params->setArguments(args);
- params->setEnvironment(target()->activeBuildConfiguration()->environment());
+ params->setEnvironment(buildConfiguration()->environment());
return AbstractProcessStep::init(earlierSteps);
}