diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-09-05 19:16:49 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-09-07 11:11:45 +0000 |
| commit | e92418edcaf5e0bf45c5923dd635abce78f4bb11 (patch) | |
| tree | 985d3d4c95ae466f23dc2b54446a9ae661faa3ea /src/plugins/android/androiddeployqtstep.cpp | |
| parent | c1dff744a016e109aa7c4e1b26149234d85466ad (diff) | |
| download | qt-creator-e92418edcaf5e0bf45c5923dd635abce78f4bb11.tar.gz | |
Fix minSdkVersion in deploy step
Deploy step uses AndroidManager::minimumSDK() which looks for the
version in the AndroidManifest.xml file which used to contain the
minimum and target sdk, but if the manifest doesn't contain that
value, this logic returns 0. So, return the defaultMinimumSDK()
in case the first way fails.
Change-Id: Id10e552d7c8de4d3544b7fa8f26ae5dd9e974df5
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/android/androiddeployqtstep.cpp')
| -rw-r--r-- | src/plugins/android/androiddeployqtstep.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/android/androiddeployqtstep.cpp b/src/plugins/android/androiddeployqtstep.cpp index 7955677111..24316cf15f 100644 --- a/src/plugins/android/androiddeployqtstep.cpp +++ b/src/plugins/android/androiddeployqtstep.cpp @@ -134,9 +134,8 @@ bool AndroidDeployQtStep::init() QTC_ASSERT(bc, return false); auto androidBuildApkStep = bc->buildSteps()->firstOfType<AndroidBuildApkStep>(); - int minTargetApi = AndroidManager::minimumSDK(target()); qCDebug(deployStepLog) << "Target architecture:" << m_androidABIs - << "Min target API" << minTargetApi; + << "Min target API" << AndroidManager::minimumSDK(target()); // Try to re-use user-provided information from an earlier step of the same type. BuildStepList *bsl = stepList(); |