From c1f08cca86a2e1ba09e9e4a8fb512f9a08756032 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 25 Mar 2020 15:09:02 +0100
Subject: [PATCH] McuSupport: Add SDK version to kit name (and to kit data)

First step towards Qt for MCUs SDK version handling.

Task-number: QTCREATORBUG-23823
Change-Id: I125fe841d9355aa26b4e4701ac9a5fec31987e08
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/mcusupport/mcusupportconstants.h |  1 +
 src/plugins/mcusupport/mcusupportoptions.cpp | 12 ++++++++++--
 src/plugins/mcusupport/mcusupportoptions.h   |  3 +++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/plugins/mcusupport/mcusupportconstants.h b/src/plugins/mcusupport/mcusupportconstants.h
index bc0b7b21d33..88489b1196c 100644
--- a/src/plugins/mcusupport/mcusupportconstants.h
+++ b/src/plugins/mcusupport/mcusupportconstants.h
@@ -34,6 +34,7 @@ const char RUNCONFIGURATION[] = "McuSupport.RunConfiguration";
 const char SETTINGS_ID[] = "CC.McuSupport.Configuration";
 const char KIT_MCUTARGET_VENDOR_KEY[] = "McuSupport.McuTargetVendor";
 const char KIT_MCUTARGET_MODEL_KEY[] = "McuSupport.McuTargetModel";
+const char KIT_MCUTARGET_SDKVERSION_KEY[] = "McuSupport.McuTargetSdkVersion";
 
 const char SETTINGS_GROUP[] = "McuSupport";
 const char SETTINGS_KEY_PACKAGE_PREFIX[] = "Package_";
diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp
index 6d888b48f5e..bbef5b68013 100644
--- a/src/plugins/mcusupport/mcusupportoptions.cpp
+++ b/src/plugins/mcusupport/mcusupportoptions.cpp
@@ -404,6 +404,12 @@ void McuSupportOptions::deletePackagesAndTargets()
     mcuTargets.clear();
 }
 
+const QVersionNumber &McuSupportOptions::supportedQulVersion()
+{
+    static const QVersionNumber v({1, 1, 0});
+    return v;
+}
+
 void McuSupportOptions::setQulDir(const Utils::FilePath &dir)
 {
     deletePackagesAndTargets();
@@ -443,6 +449,8 @@ static void setKitProperties(const QString &kitName, ProjectExplorer::Kit *k,
     k->setUnexpandedDisplayName(kitName);
     k->setValue(Constants::KIT_MCUTARGET_VENDOR_KEY, mcuTarget->vendor());
     k->setValue(Constants::KIT_MCUTARGET_MODEL_KEY, mcuTarget->qulPlatform());
+    k->setValue(Constants::KIT_MCUTARGET_SDKVERSION_KEY,
+                McuSupportOptions::supportedQulVersion().toString());
     k->setAutoDetected(true);
     k->makeSticky();
     if (mcuTargetIsDesktop(mcuTarget)) {
@@ -539,8 +547,8 @@ QString McuSupportOptions::kitName(const McuTarget *mcuTarget) const
     const QString colorDepth = mcuTarget->colorDepth() > 0
             ? QString::fromLatin1(" %1bpp").arg(mcuTarget->colorDepth())
             : "";
-    return QString::fromLatin1("Qt for MCUs - %1%2")
-            .arg(mcuTarget->qulPlatform(), colorDepth);
+    return QString::fromLatin1("Qt for MCUs %1 - %2%3")
+            .arg(supportedQulVersion().toString(), mcuTarget->qulPlatform(), colorDepth);
 }
 
 QList<ProjectExplorer::Kit *> McuSupportOptions::existingKits(const McuTarget *mcuTargt)
diff --git a/src/plugins/mcusupport/mcusupportoptions.h b/src/plugins/mcusupport/mcusupportoptions.h
index 92790bac13c..afc26c5003a 100644
--- a/src/plugins/mcusupport/mcusupportoptions.h
+++ b/src/plugins/mcusupport/mcusupportoptions.h
@@ -27,6 +27,7 @@
 
 #include <QObject>
 #include <QVector>
+#include <QVersionNumber>
 
 QT_FORWARD_DECLARE_CLASS(QWidget)
 
@@ -170,6 +171,8 @@ public:
     static void registerQchFiles();
     static void registerExamples();
 
+    static const QVersionNumber &supportedQulVersion();
+
 private:
     void deletePackagesAndTargets();