feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: Make two uses of Target::activeBuildConfiguration() explicit

Browse Source 
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 <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-04-14 15:40:07 +02:00
parent c0c2df203d
commit ca4908bab5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/android/androiddeployqtstep.cpp
View File

@@ -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<AndroidBuildApkStep>();
@@ -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 += "/";