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

Android: Access buildTargetSdk directly when possible

Browse Source 
Change-Id: I1f9996919d982f8e54c595abaa44ed0e10a79422
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2020-02-12 18:25:11 +01:00
parent bf25c21eb0
commit 4bd316ab62
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -234,8 +234,7 @@ bool AndroidBuildApkStep::init()
return true; return true;
} }
QString buildTargetSdk = AndroidManager::buildTargetSDK(target()); if (m_buildTargetSdk.isEmpty()) {
if (buildTargetSdk.isEmpty()) {
emit addOutput(tr("Android build SDK not defined. Check Android settings."), emit addOutput(tr("Android build SDK not defined. Check Android settings."),
OutputFormat::Stderr); OutputFormat::Stderr);
return false; return false;
@@ -243,7 +242,7 @@ bool AndroidBuildApkStep::init()
QStringList arguments = {"--input", m_inputFile, QStringList arguments = {"--input", m_inputFile,
"--output", outputDir, "--output", outputDir,
"--android-platform", AndroidManager::buildTargetSDK(target()), "--android-platform", m_buildTargetSdk,
"--jdk", AndroidConfigurations::currentConfig().openJDKLocation().toString()}; "--jdk", AndroidConfigurations::currentConfig().openJDKLocation().toString()};
if (m_verbose) if (m_verbose)