McuSupport: Tag "board" and Kit with vendor name

Needed for an upcoming hack, but also later when we "zero-config"
the boards.

Change-Id: I240cc252ebba458cab71db24740266756d0e8b37
Reviewed-by: Aurindam Jana <aurindam.jana@qt.io>

3 files changed, 24 insertions, 11 deletions

diff --git a/src/plugins/mcusupport/mcusupportconstants.h b/src/plugins/mcusupport/mcusupportconstants.h
index 2cc5bee41a1..4643ed34758 100644
--- a/src/plugins/mcusupport/mcusupportconstants.h
+++ b/src/plugins/mcusupport/mcusupportconstants.h
@@ -34,6 +34,7 @@ const char DEVICE_ID[] = "McuSupport.Device";
 const char MCUSUPPORT_QT_VERSION[] = "Qt4ProjectManager.QtVersion.McuSupport";
 const char RUNCONFIGURATION[] = "McuSupport.RunConfiguration";
 const char SETTINGS_ID[] = "CC.McuSupport.Configuration";
+const char KIT_BOARD_VENDOR_KEY[] = "McuSupport.BoardVendor";
 const char KIT_BOARD_MODEL_KEY[] = "McuSupport.BoardModel";
 
 const char ENVVAR_ARMGCC_DIR[] = "ARMGCC_DIR";
diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp
index 658e0568ef1..b5088f36852 100644
--- a/src/plugins/mcusupport/mcusupportoptions.cpp
+++ b/src/plugins/mcusupport/mcusupportoptions.cpp
@@ -198,9 +198,11 @@ void PackageOptions::updateStatus()
     m_statusLabel->setText(statusText);
 }
 
-BoardOptions::BoardOptions(const QString &model, const QString &toolChainFileName,
-                           const QString &qulPlatform, const QVector<PackageOptions*> &packages)
-    : m_model(model)
+BoardOptions::BoardOptions(const QString &vendor, const QString &model,
+                           const QString &toolChainFileName, const QString &qulPlatform,
+                           const QVector<PackageOptions*> &packages)
+    : m_vendor(vendor)
+    , m_model(model)
     , m_toolChainFile(toolChainFileName)
     , m_qulPlatform(qulPlatform)
     , m_packages(packages)
@@ -227,6 +229,11 @@ QVector<PackageOptions *> BoardOptions::packages() const
     return m_packages;
 }
 
+QString BoardOptions::vendor() const
+{
+    return m_vendor;
+}
+
 static PackageOptions *createQulPackage()
 {
     auto result = new PackageOptions(
@@ -353,13 +360,16 @@ McuSupportOptions::McuSupportOptions(QObject *parent)
     packages = {armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage,
                 evkbImxrt1050SdkPackage, seggerJLinkPackage, qulPackage};
 
-    boards.append(new BoardOptions(
+    const QString vendorStm = "STM";
+    const QString vendorNxp = "NXP";
+    const QString vendorQt = "Qt";
+    boards.append(new BoardOptions(vendorStm,
                       "stm32f7508", "CMake/stm32f7508-discovery.cmake", "", stmPackages));
-    boards.append(new BoardOptions(
+    boards.append(new BoardOptions(vendorStm,
                       "stm32f769i", "CMake/stm32f769i-discovery.cmake", "", stmPackages));
-    boards.append(new BoardOptions(
+    boards.append(new BoardOptions(vendorNxp,
                       "evkbimxrt1050", "CMake/evkbimxrt1050-toolchain.cmake", "", nxpPackages));
-    boards.append(new BoardOptions(
+    boards.append(new BoardOptions(vendorQt,
                       "Desktop", "", "Qt", desktopPackages));
 
     for (auto package : packages)
@@ -419,7 +429,8 @@ static void setKitProperties(ProjectExplorer::Kit *k, const BoardOptions* board)
 {
     using namespace ProjectExplorer;
 
-    k->setUnexpandedDisplayName("Qt MCU - " + board->model());
+    k->setUnexpandedDisplayName("QtMCU - " + board->model());
+    k->setValue(Constants::KIT_BOARD_VENDOR_KEY, board->vendor());
     k->setValue(Constants::KIT_BOARD_MODEL_KEY, board->model());
     k->setAutoDetected(false);
     if (!isDesktop(board)) {
diff --git a/src/plugins/mcusupport/mcusupportoptions.h b/src/plugins/mcusupport/mcusupportoptions.h
index 9798e94d3cd..f7f2d84b390 100644
--- a/src/plugins/mcusupport/mcusupportoptions.h
+++ b/src/plugins/mcusupport/mcusupportoptions.h
@@ -101,16 +101,17 @@ class BoardOptions : public QObject
     Q_OBJECT
 
 public:
-    BoardOptions(const QString &model, const QString &toolChainFile, const QString &qulPlatform,
-                 const QVector<PackageOptions *> &packages);
+    BoardOptions(const QString &vendor, const QString &model, const QString &toolChainFile,
+                 const QString &qulPlatform, const QVector<PackageOptions *> &packages);
 
+    QString vendor() const;
     QString model() const;
     QString toolChainFile() const;
     QString qulPlatform() const;
     QVector<PackageOptions *> packages() const;
 
-
 private:
+    const QString m_vendor;
     const QString m_model;
     const QString m_toolChainFile;
     const QString m_qulPlatform;