From ff925d85e9bb1cfc2018d28ed738b015d7a96c55 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Mon, 4 May 2020 16:34:38 +0200
Subject: [PATCH] McuSupport: Remove outdated kits on KitManager::kitsLoaded

... instead while creating other kits.

Task-number: QTCREATORBUG-23891
Change-Id: I7ef3a6c92d94d8e6dd7499490a694be1d91ed35e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/mcusupport/mcusupportoptionspage.cpp | 1 -
 src/plugins/mcusupport/mcusupportplugin.cpp      | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp
index e4506b902d4..b06a97f174c 100644
--- a/src/plugins/mcusupport/mcusupportoptionspage.cpp
+++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp
@@ -231,7 +231,6 @@ void McuSupportOptionsWidget::apply()
         return;
 
     McuSupportOptions::registerQchFiles();
-    McuSupportOptions::removeOutdatedKits();
 
     const McuTarget *mcuTarget = currentMcuTarget();
     if (!mcuTarget)
diff --git a/src/plugins/mcusupport/mcusupportplugin.cpp b/src/plugins/mcusupport/mcusupportplugin.cpp
index 3028c7e80e2..0be99d8c05b 100644
--- a/src/plugins/mcusupport/mcusupportplugin.cpp
+++ b/src/plugins/mcusupport/mcusupportplugin.cpp
@@ -36,6 +36,7 @@
 
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/jsonwizard/jsonwizardfactory.h>
+#include <projectexplorer/kitmanager.h>
 
 using namespace ProjectExplorer;
 
@@ -86,6 +87,10 @@ bool McuSupportPlugin::initialize(const QStringList& arguments, QString* errorSt
 void McuSupportPlugin::extensionsInitialized()
 {
     ProjectExplorer::DeviceManager::instance()->addDevice(McuSupportDevice::create());
+
+    connect(KitManager::instance(), &KitManager::kitsLoaded, [](){
+        McuSupportOptions::removeOutdatedKits();
+    });
 }
 
 } // namespace Internal