Commit 579da1fa authored by Daniel Teske's avatar Daniel Teske Committed by Alessandro Portale
Browse files

Android: Ensure that ANDROID_NDK_ROOT is set while parsing the mkspec



Task-number: QTCREATORBUG-11821
Change-Id: Icbf8d6dd84da6ddba7d9c9e540916a804fb962f1
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@digia.com>
parent 88549467
......@@ -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
......
......@@ -53,6 +53,7 @@ public:
QList<ProjectExplorer::Abi> detectQtAbis() const;
void addToEnvironment(const ProjectExplorer::Kit *k, Utils::Environment &env) const;
Utils::Environment qmakeRunEnvironment() const;
Core::FeatureSet availableFeatures() const;
QString platformName() const;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment