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

Merge remote-tracking branch 'origin/master' into 4.12

Browse Source 
Change-Id: I20de58817658e2c715ce550761976ae67b3bef4d
This commit is contained in:
Eike Ziller
2020-02-19 07:33:13 +01:00
parent 937e2b56e7 644f1e4faa
commit edc3eccd12
4 changed files with 83 additions and 85 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;
}
QString buildTargetSdk = AndroidManager::buildTargetSDK(target());
if (buildTargetSdk.isEmpty()) {
if (m_buildTargetSdk.isEmpty()) {
emit addOutput(tr("Android build SDK not defined. Check Android settings."),
OutputFormat::Stderr);
return false;
@@ -243,7 +242,7 @@ bool AndroidBuildApkStep::init()
QStringList arguments = {"--input", m_inputFile,
"--output", outputDir,
"--android-platform", AndroidManager::buildTargetSDK(target()),
"--android-platform", m_buildTargetSdk,
"--jdk", AndroidConfigurations::currentConfig().openJDKLocation().toString()};
if (m_verbose)