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

Android: Simplify Kit creation logic a bit

Browse Source 
Instead of creating and destroying in some cases only create the ones
that will be used.

Change-Id: I5c3200101ec21b4a4cf1e3c6e91bf94153278b5c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-03-12 11:49:39 +01:00
committed by Christian Kandeler
parent 14e8d39881
commit f1eac5f30a
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/plugins/android/androidconfigurations.cpp
View File

@@ -974,17 +974,6 @@ static bool matchToolChain(const ToolChain *atc, const ToolChain *btc)
return aatc->targetAbi() == abtc->targetAbi(); return aatc->targetAbi() == abtc->targetAbi();
} }
static bool matchKits(const Kit *a, const Kit *b)
{
if (QtSupport::QtKitAspect::qtVersion(a) != QtSupport::QtKitAspect::qtVersion(b))
return false;
return matchToolChain(ToolChainKitAspect::toolChain(a, ProjectExplorer::Constants::CXX_LANGUAGE_ID),
ToolChainKitAspect::toolChain(b, ProjectExplorer::Constants::CXX_LANGUAGE_ID))
&& matchToolChain(ToolChainKitAspect::toolChain(a, ProjectExplorer::Constants::C_LANGUAGE_ID),
ToolChainKitAspect::toolChain(b, ProjectExplorer::Constants::C_LANGUAGE_ID));
}
void AndroidConfigurations::registerNewToolChains() void AndroidConfigurations::registerNewToolChains()
{ {
const QList<ToolChain *> existingAndroidToolChains const QList<ToolChain *> existingAndroidToolChains
@@ -1073,6 +1062,10 @@ void AndroidConfigurations::updateAutomaticKitList()
return tc->targetAbi() == otherTc->targetAbi(); return tc->targetAbi() == otherTc->targetAbi();
}); });
QHash<Core::Id, ToolChain *> toolChainForLanguage;
for (ToolChain *tc : allLanguages)
toolChainForLanguage[tc->language()] = tc;
auto initBasicKitData = [allLanguages, device](Kit *k, const QtSupport::BaseQtVersion *qt) { auto initBasicKitData = [allLanguages, device](Kit *k, const QtSupport::BaseQtVersion *qt) {
k->setAutoDetected(true); k->setAutoDetected(true);
k->setAutoDetectionSource("AndroidConfiguration"); k->setAutoDetectionSource("AndroidConfiguration");
@@ -1092,24 +1085,27 @@ void AndroidConfigurations::updateAutomaticKitList()
}; };
for (const QtSupport::BaseQtVersion *qt : qtVersionsForArch.value(tc->targetAbi())) { for (const QtSupport::BaseQtVersion *qt : qtVersionsForArch.value(tc->targetAbi())) {
Kit *existingKit = nullptr; Kit *existingKit = Utils::findOrDefault(existingKits, [&](const Kit *b) {
const auto initializeKit = [&](Kit *k) { if (qt != QtSupport::QtKitAspect::qtVersion(b))
initBasicKitData(k, qt);
existingKit = Utils::findOrDefault(existingKits, [k](const Kit *existing) {
return matchKits(k, existing);
});
if (existingKit)
return false; return false;
initStage2(k, qt); return matchToolChain(toolChainForLanguage[ProjectExplorer::Constants::CXX_LANGUAGE_ID],
return true; ToolChainKitAspect::toolChain(b, ProjectExplorer::Constants::CXX_LANGUAGE_ID))
}; && matchToolChain(toolChainForLanguage[ProjectExplorer::Constants::C_LANGUAGE_ID],
Kit * const newKit = KitManager::registerKit(initializeKit); ToolChainKitAspect::toolChain(b, ProjectExplorer::Constants::C_LANGUAGE_ID));
QTC_ASSERT(!newKit != !existingKit, continue); });
if (!newKit) { if (existingKit) {
// Existing kit found. // Existing kit found.
// Update the existing kit with new data. // Update the existing kit with new data.
initBasicKitData(existingKit, qt); initBasicKitData(existingKit, qt);
initStage2(existingKit, qt); initStage2(existingKit, qt);
} else {
const auto initializeKit = [&](Kit *k) {
initBasicKitData(k, qt);
initStage2(k, qt);
return true;
};
Kit * const newKit = KitManager::registerKit(initializeKit);
QTC_CHECK(!newKit != !existingKit);
} }
} }
} }