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

Android: Ensure that ANDROID_NDK_ROOT is set while parsing the mkspec

Browse Source 
Task-number: QTCREATORBUG-11821
Change-Id: Icbf8d6dd84da6ddba7d9c9e540916a804fb962f1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
This commit is contained in:
Daniel Teske
2014-03-27 13:12:28 +01:00
committed by Alessandro Portale
parent 88549467b0
commit 579da1faf1
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/android/androidqtversion.cpp
View File

@@ -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