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

Android: Set ANDROID_SDK_ROOT environment variable

Browse Source 
Needed by androiddeployqt

Task-number: QTCREATORBUG-10289

Change-Id: I64abef7278fab5c9261f9f954af416410f69ce0d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
This commit is contained in:
Daniel Teske
2013-10-02 11:49:35 +02:00
parent 1c5cd2c19a
commit bc3b0859bb
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/android/androidtoolchain.cpp
View File

@@ -124,6 +124,7 @@ void AndroidToolChain::addToEnvironment(Environment &env) const
if (!javaHome.isEmpty() && QFileInfo(javaHome).exists()) if (!javaHome.isEmpty() && QFileInfo(javaHome).exists())
env.set(QLatin1String("JAVA_HOME"), javaHome); env.set(QLatin1String("JAVA_HOME"), javaHome);
env.set(QLatin1String("ANDROID_HOME"), AndroidConfigurations::instance().config().sdkLocation.toString()); env.set(QLatin1String("ANDROID_HOME"), AndroidConfigurations::instance().config().sdkLocation.toString());
env.set(QLatin1String("ANDROID_SDK_ROOT"), AndroidConfigurations::instance().config().sdkLocation.toString());
} }
bool AndroidToolChain::operator ==(const ToolChain &tc) const bool AndroidToolChain::operator ==(const ToolChain &tc) const