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

Android: Inline *AndroidBuildApkStep::findInBuild() into callers

Browse Source 
This is an unusual and unneeded indirection.

Change-Id: If0e241364899555f5fe6e07fed38f440bbf2812b
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2019-12-20 10:54:54 +01:00
parent 20a5aa889f
commit d0b8e1a1ae
4 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androidbuildapkstep.cpp
View File

@@ -134,15 +134,6 @@ AndroidBuildApkStep::AndroidBuildApkStep(BuildStepList *parent)
setImmutable(true); setImmutable(true);
} }
AndroidBuildApkStep *AndroidBuildApkStep::findInBuild(const BuildConfiguration *bc)
{
if (!bc)
return nullptr;
BuildStepList *bsl = bc->buildSteps();
QTC_ASSERT(bsl, return nullptr);
return bsl->firstOfType<AndroidBuildApkStep>();
}
bool AndroidBuildApkStep::init() bool AndroidBuildApkStep::init()
{ {
ProjectExplorer::BuildConfiguration *bc = buildConfiguration(); ProjectExplorer::BuildConfiguration *bc = buildConfiguration();

2
src/plugins/android/androidbuildapkstep.h
View File

@@ -45,8 +45,6 @@ class ANDROID_EXPORT AndroidBuildApkStep : public ProjectExplorer::AbstractProce
public: public:
AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc); AndroidBuildApkStep(ProjectExplorer::BuildStepList *bc);
static AndroidBuildApkStep *findInBuild(const ProjectExplorer::BuildConfiguration *bc);
bool fromMap(const QVariantMap &map) override; bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override; QVariantMap toMap() const override;

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

@@ -174,8 +174,9 @@ bool AndroidDeployQtStep::init()
RunConfiguration *rc = target()->activeRunConfiguration(); RunConfiguration *rc = target()->activeRunConfiguration();
QTC_ASSERT(rc, return false); QTC_ASSERT(rc, return false);
ProjectExplorer::BuildConfiguration *bc = buildConfiguration(); ProjectExplorer::BuildConfiguration *bc = buildConfiguration();
QTC_ASSERT(rc, return false);
auto androidBuildApkStep = AndroidBuildApkStep::findInBuild(bc); auto androidBuildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>();
int minTargetApi = AndroidManager::minimumSDK(target()); int minTargetApi = AndroidManager::minimumSDK(target());
qCDebug(deployStepLog) << "Target architecture:" << m_androidABIs qCDebug(deployStepLog) << "Target architecture:" << m_androidABIs
<< "Min target API" << minTargetApi; << "Min target API" << minTargetApi;

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

@@ -250,8 +250,10 @@ int AndroidManager::minimumSDK(const ProjectExplorer::Kit *kit)
QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target) QString AndroidManager::buildTargetSDK(ProjectExplorer::Target *target)
{ {
if (auto androidBuildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration())) if (auto bc = target->activeBuildConfiguration()) {
if (auto androidBuildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>())
return androidBuildApkStep->buildTargetSdk(); return androidBuildApkStep->buildTargetSdk();
}
QString fallback = AndroidConfig::apiLevelNameFor( QString fallback = AndroidConfig::apiLevelNameFor(
AndroidConfigurations::sdkManager()->latestAndroidSdkPlatform()); AndroidConfigurations::sdkManager()->latestAndroidSdkPlatform());
@@ -297,7 +299,10 @@ Utils::FilePath AndroidManager::apkPath(const ProjectExplorer::Target *target)
{ {
QTC_ASSERT(target, return Utils::FilePath()); QTC_ASSERT(target, return Utils::FilePath());
auto buildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration()); auto bc = target->activeBuildConfiguration();
if (!bc)
return {};
auto buildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>();
if (!buildApkStep) if (!buildApkStep)
return Utils::FilePath(); return Utils::FilePath();
@@ -314,7 +319,10 @@ FilePath AndroidManager::aabPath(const Target *target)
{ {
QTC_ASSERT(target, return Utils::FilePath()); QTC_ASSERT(target, return Utils::FilePath());
auto buildApkStep = AndroidBuildApkStep::findInBuild(target->activeBuildConfiguration()); auto bc = target->activeBuildConfiguration();
if (!bc)
return {};
auto buildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>();
if (!buildApkStep) if (!buildApkStep)
return Utils::FilePath(); return Utils::FilePath();