Commit 4bfe6f93 authored by Eike Ziller's avatar Eike Ziller Committed by hjk
Browse files

Revert "ToolChains: Do not list ToolChains removed by the sdktool"

Obviously the patch removes too much.
This reverts commit 9a5f81d9

.

Change-Id: Id6f128a8d72b51d0d1701a0a82377b56e2a314b2
Reviewed-by: default avatarhjk <hjk121@nokiamail.com>
parent 9b27c9b9
...@@ -204,17 +204,15 @@ void ToolChainManager::restoreToolChains() ...@@ -204,17 +204,15 @@ void ToolChainManager::restoreToolChains()
} }
readTcs.clear(); readTcs.clear();
Utils::erase(tcsToCheck, [tcsToRegister](ToolChain *toCheck) -> bool { // Remove TCs configured by the SDK:
// Remove TCs configured by the SDK and found in the user settings: foreach (ToolChain *tc, tcsToRegister) {
if (Utils::anyOf(tcsToRegister, Utils::equal(&ToolChain::id, toCheck->id()))) for (int i = tcsToCheck.count() - 1; i >= 0; --i) {
return true; if (tcsToCheck.at(i)->id() == tc->id()) {
delete tcsToCheck.at(i);
// Remove TCs from user settings that are no longer configured by the SDK: tcsToCheck.removeAt(i);
if (toCheck->detection() == ToolChain::AutoDetectionFromSettings }
&& !Utils::anyOf(tcsToRegister, Utils::equal(&ToolChain::id, toCheck->id()))) }
return true; }
return false;
});
// Then auto detect // Then auto detect
QList<ToolChain *> detectedTcs; QList<ToolChain *> detectedTcs;
......
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