From ca4908bab526a14e61f4aebfc0badee0b2ed4b12 Mon Sep 17 00:00:00 2001 From: hjk Date: Tue, 14 Apr 2020 15:40:07 +0200 Subject: [PATCH] Android: Make two uses of Target::activeBuildConfiguration() explicit This avoid the QTC_ASSERT that guards the implicit use in BuildStep:: buildConfiguration(). In the current architecture the use cannot be avoided, but it goes away when Run and Deploy are moved below Build instead of Target, as planned. Change-Id: I6020a0854ea99f0102372341163dda6b4b7a8acd Reviewed-by: Christian Stenger --- src/plugins/android/androiddeployqtstep.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index af0770598d3..bac9e4ff491 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -178,7 +178,7 @@ bool AndroidDeployQtStep::init() RunConfiguration *rc = target()->activeRunConfiguration(); QTC_ASSERT(rc, return false); - ProjectExplorer::BuildConfiguration *bc = buildConfiguration(); + BuildConfiguration *bc = target()->activeBuildConfiguration(); QTC_ASSERT(bc, return false); auto androidBuildApkStep = bc->buildSteps()->firstOfType(); @@ -470,7 +470,7 @@ bool AndroidDeployQtStep::runImpl() void AndroidDeployQtStep::gatherFilesToPull() { m_filesToPull.clear(); - ProjectExplorer::BuildConfiguration *bc = buildConfiguration(); + BuildConfiguration *bc = target()->activeBuildConfiguration(); QString buildDir = bc ? bc->buildDirectory().toString() : QString(); if (bc && !buildDir.endsWith("/")) { buildDir += "/";