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

Android: Replace two direct uses of Target::activeRunConfiguration

Browse Source 
... by Target::activeBuildKey.

This is effectively the same problem under the hood, but isolates
it a bit.

Change-Id: Ie37a4d67aab3e044bb99b7b8d2bd7900198c5538
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
hjk
2021-08-31 08:49:27 +02:00
parent 0c8e196cb2
commit abeaeeffdc
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androidmanager.cpp
View File

@@ -101,9 +101,7 @@ static int parseMinSdk(const QDomElement &manifestElem);
static const ProjectNode *currentProjectNode(const Target *target) static const ProjectNode *currentProjectNode(const Target *target)
{ {
if (RunConfiguration *rc = target->activeRunConfiguration()) return target->project()->findNodeForBuildKey(target->activeBuildKey());
return target->project()->findNodeForBuildKey(rc->buildKey());
return nullptr;
} }
QString AndroidManager::packageName(const Target *target) QString AndroidManager::packageName(const Target *target)
@@ -643,7 +641,6 @@ static bool mergeGradleProperties(const QString &path, GradleProperties properti
return true; return true;
} }
bool AndroidManager::updateGradleProperties(Target *target, const QString &buildKey) bool AndroidManager::updateGradleProperties(Target *target, const QString &buildKey)
{ {
QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit()); QtSupport::BaseQtVersion *version = QtSupport::QtKitAspect::qtVersion(target->kit());
@@ -654,8 +651,7 @@ bool AndroidManager::updateGradleProperties(Target *target, const QString &build
if (key.isEmpty()) { if (key.isEmpty()) {
// FIXME: This case is triggered from AndroidBuildApkWidget::createApplicationGroup // FIXME: This case is triggered from AndroidBuildApkWidget::createApplicationGroup
// and should be avoided. // and should be avoided.
if (RunConfiguration *rc = target->activeRunConfiguration()) key = target->activeBuildKey();
key = rc->buildKey();
} }
QTC_ASSERT(!key.isEmpty(), return false); QTC_ASSERT(!key.isEmpty(), return false);