diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2014-03-27 13:12:28 +0100 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@digia.com> | 2014-04-03 13:08:22 +0200 |
| commit | 579da1faf1124a0d1ea42ac878d61b8d5171a533 (patch) | |
| tree | 565bd3d6ba682cef10d86a7f24fe0a797dd68c36 /src/plugins/android/androidqtversion.cpp | |
| parent | 88549467b065bde0d74df4893844daa8b905c31c (diff) | |
| download | qt-creator-579da1faf1124a0d1ea42ac878d61b8d5171a533.tar.gz | |
Android: Ensure that ANDROID_NDK_ROOT is set while parsing the mkspec
Task-number: QTCREATORBUG-11821
Change-Id: Icbf8d6dd84da6ddba7d9c9e540916a804fb962f1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Diffstat (limited to 'src/plugins/android/androidqtversion.cpp')
| -rw-r--r-- | src/plugins/android/androidqtversion.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/plugins/android/androidqtversion.cpp b/src/plugins/android/androidqtversion.cpp index dc63f0aaaf..45bfef0152 100644 --- a/src/plugins/android/androidqtversion.cpp +++ b/src/plugins/android/androidqtversion.cpp @@ -125,6 +125,13 @@ void AndroidQtVersion::addToEnvironment(const ProjectExplorer::Kit *k, Utils::En AndroidConfigurations::currentConfig().bestNdkPlatformMatch(AndroidManager::buildTargetSDK(target))); } +Utils::Environment AndroidQtVersion::qmakeRunEnvironment() const +{ + Utils::Environment env = Utils::Environment::systemEnvironment(); + env.set(QLatin1String("ANDROID_NDK_ROOT"), AndroidConfigurations::currentConfig().ndkLocation().toUserOutput()); + return env; +} + QString AndroidQtVersion::description() const { //: Qt Version is meant for Android |