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

Android: Mark toolchains from not the current ndk as invalid

Browse Source 
And ensure that they are removed on changing the ndk directory.

Change-Id: Ifd3de4d2ac53e93c70b683e11c1368755969ccee
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Daniel Teske
2013-02-27 12:33:21 +01:00
parent 28b0e9d3ea
commit fba4106311
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/android/androidsettingspage.cpp
View File

@@ -83,7 +83,14 @@ void AndroidSettingsPage::apply()
ProjectExplorer::ToolChainManager::instance()->registerToolChain(tc); ProjectExplorer::ToolChainManager::instance()->registerToolChain(tc);
} }
// TODO deregister old automatic toolchains? for (int i = 0; i < existingToolChains.count(); ++i) {
ProjectExplorer::ToolChain *tc = existingToolChains.at(i);
if (tc->type() == QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE)) {
if (!tc->isValid()) {
ProjectExplorer::ToolChainManager::instance()->deregisterToolChain(tc);
}
}
}
AndroidConfigurations::instance().updateAutomaticKitList(); AndroidConfigurations::instance().updateAutomaticKitList();
} }

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

@@ -101,7 +101,8 @@ QString AndroidToolChain::typeDisplayName() const
bool AndroidToolChain::isValid() const bool AndroidToolChain::isValid() const
{ {
return GccToolChain::isValid() && targetAbi().isValid() && !m_ndkToolChainVersion.isEmpty(); return GccToolChain::isValid() && targetAbi().isValid() && !m_ndkToolChainVersion.isEmpty()
&& compilerCommand().isChildOf(AndroidConfigurations::instance().config().ndkLocation);
} }
void AndroidToolChain::addToEnvironment(Environment &env) const void AndroidToolChain::addToEnvironment(Environment &env) const