Commit dea73108 authored by Tobias Hunger's avatar Tobias Hunger

Kit: small fixes

Change-Id: I24ce10ac147b116ca438681b34cdc4398675edeb
Reviewed-by: default avatarDaniel Teske <daniel.teske@digia.com>
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 915c9985
......@@ -216,16 +216,11 @@ void Kit::fix()
void Kit::setup()
{
KitGuard g(this);
QHash<Core::Id, QVariant> data = d->m_data;
for (int i = 0; i < 5; ++i) {
// Allow for some retries to settle down in a good configuration
// This is necessary for the Qt version to pick its preferred tool chain
// and that to pick a working debugger afterwards.
foreach (KitInformation *i, KitManager::instance()->kitInformation())
i->setup(this);
if (d->m_data == data)
break;
}
// Process the KitInfos in reverse order: They may only be based on other information lower in
// the stack.
QList<KitInformation *> info = KitManager::instance()->kitInformation();
for (int i = info.count() - 1; i >= 0; --i)
info.at(i)->setup(this);
}
QString Kit::displayName() const
......
......@@ -66,7 +66,8 @@ public:
bool isValid() const;
bool hasWarning() const;
QList<Task> validate() const;
void fix(); // Fix the individual kit information.
void fix(); // Fix the individual kit information: Make sure it contains a valid value.
// Fix will not look at other information in the kit!
void setup(); // Apply advanced magic(TM). Used only once on each kit during initial setup.
QString displayName() const;
......
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