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

KitManager: Simplify merging of loaded kits

Browse Source 
Change-Id: I7d1a8706ad5e85caadf2d41b56c9c3cc00c5a276
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Tobias Hunger
2018-07-03 16:00:44 +02:00
parent e20075f8cf
commit 8c6854b421
1 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/projectexplorer/kitmanager.cpp
+16 -17
View File
@@ -115,8 +115,6 @@ void KitManager::restoreKits()
{
QTC_ASSERT(!d->m_initialized, return );
QList<Kit *> kitsToCheck;
QList<Kit *> resultList;
// read all kits from SDK
@@ -130,10 +128,11 @@ void KitManager::restoreKits()
}
// read all kits from user file
std::vector<Kit *> kitsToCheck;
KitList userKits = restoreKits(settingsFileName());
foreach (Kit *k, userKits.kits) {
if (k->isSdkProvided()) {
kitsToCheck.append(k);
kitsToCheck.emplace_back(k);
} else {
completeKit(k); // Store manual kits
resultList.append(k);
@@ -148,23 +147,23 @@ void KitManager::restoreKits()
// with the information from the user settings file
// Check whether we had this kit stored and prefer the stored one:
for (int i = 0; i < kitsToCheck.count(); ++i) {
if (kitsToCheck.at(i)->id() == current->id()) {
toStore = kitsToCheck.at(i);
kitsToCheck.removeAt(i);
const auto i = std::find_if(std::begin(kitsToCheck),
std::end(kitsToCheck),
Utils::equal(&Kit::id, current->id()));
if (i != std::end(kitsToCheck)) {
toStore = *i;
kitsToCheck.erase(i);
// Overwrite settings that the SDK sets to those values:
foreach (const KitInformation *ki, kitInformation()) {
// Copy sticky settings over:
if (current->isSticky(ki->id())) {
toStore->setValue(ki->id(), current->value(ki->id()));
toStore->setSticky(ki->id(), true);
}
// Overwrite settings that the SDK sets to those values:
foreach (const KitInformation *ki, kitInformation()) {
// Copy sticky settings over:
if (current->isSticky(ki->id())) {
toStore->setValue(ki->id(), current->value(ki->id()));
toStore->setSticky(ki->id(), true);
}
delete current;
break;
}
delete current;
}
completeKit(toStore); // Store manual kits
resultList.append(toStore);