Commit 0b777b00 authored by Tobias Hunger's avatar Tobias Hunger

Kits: Always use settings found in the SDK

Keep settings not found in the SDK-installed kit as seen in the
user-specific settings, but use the SDK settings for everything
else.

Downside: The compilers might change if you have several compilers
supporting the same ABI.

Change-Id: I71a0935cc180149b333ec38a03bd2556892c49cc
Tasknumber: QTCREATORBUG-8390
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
parent 8c8e7b4c
......@@ -168,6 +168,13 @@ void KitManager::restoreKits()
if (kitsToCheck.at(i)->id() == current->id()) {
toStore = kitsToCheck.at(i);
kitsToCheck.removeAt(i);
// Overwrite settings that the SDK sets to those values:
foreach (const KitInformation *ki, kitInformation()) {
if (current->hasValue(ki->dataId()))
toStore->setValue(ki->dataId(), current->value(ki->dataId()));
}
delete current;
break;
}
......
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