Kits: Reduce magic while improving setup

Task-number: QTCREATORBUG-8576
Task-number: QTCREATORBUG-8081

Change-Id: I9a6675a8ae97517f78bca026c4aa0edca82d606d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp
index 1daf495349..8c5a3cb055 100644
--- a/src/plugins/projectexplorer/kitmanager.cpp
+++ b/src/plugins/projectexplorer/kitmanager.cpp
@@ -148,9 +148,11 @@ void KitManager::restoreKits()
     QFileInfo kitFile(systemSettingsFile.absolutePath() + QLatin1String(KIT_FILENAME));
     if (kitFile.exists()) {
         KitList system = restoreKits(Utils::FileName(kitFile));
-        // make sure we mark these as autodetected!
-        foreach (Kit *k, system.kits)
+        // make sure we mark these as autodetected and run additional setup logic
+        foreach (Kit *k, system.kits) {
             k->setAutoDetected(true);
+            k->setup();
+        }
 
         // SDK kits are always considered to be up for validation since they might have been
         // extended with additional information by creator in the meantime:
@@ -202,6 +204,8 @@ void KitManager::restoreKits()
         defaultKit->setAutoDetected(false);
         defaultKit->setIconPath(QLatin1String(":///DESKTOP///"));
 
+        defaultKit->setup();
+
         addKit(defaultKit);
     }