diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2019-11-04 18:01:54 +0100 |
|---|---|---|
| committer | Aurindam Jana <aurindam.jana@qt.io> | 2019-11-04 17:47:57 +0000 |
| commit | af6ec7943e62e272a3ba48bf51b7786ba6284826 (patch) | |
| tree | febd5c970ba0e1345548301081251aba0d2065dd /src/plugins/mcusupport/mcusupportoptions.cpp | |
| parent | ebc2628116203a53e54b54dc297ce94993e08f1a (diff) | |
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>
Diffstat (limited to 'src/plugins/mcusupport/mcusupportoptions.cpp')
| -rw-r--r-- | src/plugins/mcusupport/mcusupportoptions.cpp | 27 |
1 files changed, 19 insertions, 8 deletions
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)) { |