Merge remote-tracking branch 'origin/4.12'

Change-Id: I11936ad9e4515c3c6c9df1d949cc8116aeccd4c4
2020-05-06 09:43:20 +02:00
parent 8bac57cd68 d4164da52e
commit bf490b62e0
22 changed files with 310 additions and 208 deletions
--- 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)