diff options
author | Alessandro Portale <alessandro.portale@qt.io> | 2019-11-12 13:58:23 +0100 |
---|---|---|
committer | Alessandro Portale <alessandro.portale@qt.io> | 2019-11-12 18:14:46 +0000 |
commit | 9641de200711afbd857d977f86e94e103172ef20 (patch) | |
tree | b9150d53bf242180a22a936a9e336256d1d4b8d6 | |
parent | ce83b2a93c0f7fe9a6c5591b2fbc46d83e23717e (diff) | |
download | qt-creator-9641de200711afbd857d977f86e94e103172ef20.tar.gz |
McuSupport: Distinguish "Evaluation" and "Engineering" roles
"Evaluation" and "Engineering" kits need to be set up differently.
Change-Id: I649fed9cbdff248c5cbc69e65a095ced1f25326e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
-rw-r--r-- | src/plugins/mcusupport/mcusupportoptions.cpp | 41 | ||||
-rw-r--r-- | src/plugins/mcusupport/mcusupportoptionspage.cpp | 8 |
2 files changed, 35 insertions, 14 deletions
diff --git a/src/plugins/mcusupport/mcusupportoptions.cpp b/src/plugins/mcusupport/mcusupportoptions.cpp index cb1981c42d..901642d2c0 100644 --- a/src/plugins/mcusupport/mcusupportoptions.cpp +++ b/src/plugins/mcusupport/mcusupportoptions.cpp @@ -351,26 +351,43 @@ McuSupportOptions::McuSupportOptions(QObject *parent) toolchainPackage = armGccPackage; - - auto stmPackages = {armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage, - qulPackage}; - auto nxpPackages = {armGccPackage, evkbImxrt1050SdkPackage, seggerJLinkPackage, - qulPackage}; - auto desktopPackages = {qulPackage}; - packages = {armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage, - evkbImxrt1050SdkPackage, seggerJLinkPackage, qulPackage}; + auto stmEvalPackages = { + armGccPackage, stm32CubeProgrammerPackage, qulPackage}; + auto stmEngPackages = { + armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage, qulPackage}; + auto nxpEvalPackages = { + armGccPackage, seggerJLinkPackage, qulPackage}; + auto nxpEngPackages = { + armGccPackage, evkbImxrt1050SdkPackage, seggerJLinkPackage, qulPackage}; + auto desktopPackages = { + qulPackage}; + packages = { + armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage, evkbImxrt1050SdkPackage, + seggerJLinkPackage, qulPackage}; const QString vendorStm = "STM"; const QString vendorNxp = "NXP"; const QString vendorQt = "Qt"; + + boards.append(new BoardOptions(vendorStm, + "stm32f7508", + "CMake/stm32f7508-discovery.cmake", "", stmEvalPackages)); boards.append(new BoardOptions(vendorStm, - "stm32f7508", "CMake/stm32f7508-discovery.cmake", "", stmPackages)); + "stm32f769i", + "CMake/stm32f769i-discovery.cmake", "", stmEvalPackages)); boards.append(new BoardOptions(vendorStm, - "stm32f769i", "CMake/stm32f769i-discovery.cmake", "", stmPackages)); + "Engineering", + "CMake/<toolchain file>", "", stmEngPackages)); + + boards.append(new BoardOptions(vendorNxp, + "evkbimxrt1050", + "CMake/evkbimxrt1050-toolchain.cmake", "", nxpEvalPackages)); boards.append(new BoardOptions(vendorNxp, - "evkbimxrt1050", "CMake/evkbimxrt1050-toolchain.cmake", "", nxpPackages)); + "Engineering", + "CMake/<toolchain file>", "", nxpEngPackages)); + boards.append(new BoardOptions(vendorQt, - "Desktop", "", "Qt", desktopPackages)); + "Desktop", "", "Qt", desktopPackages)); for (auto package : packages) connect(package, &PackageOptions::changed, [this](){ diff --git a/src/plugins/mcusupport/mcusupportoptionspage.cpp b/src/plugins/mcusupport/mcusupportoptionspage.cpp index e764113f31..62024e376b 100644 --- a/src/plugins/mcusupport/mcusupportoptionspage.cpp +++ b/src/plugins/mcusupport/mcusupportoptionspage.cpp @@ -73,8 +73,10 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(const McuSupportOptions *option auto boardComboBox = new QComboBox; boardChooserLabel->setBuddy(boardComboBox); boardChooserLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); - boardComboBox->addItems(Utils::transform<QStringList>(m_options->boards, [](BoardOptions *b){ - return b->model();})); + boardComboBox->addItems( + Utils::transform<QStringList>(m_options->boards, [this](BoardOptions *b){ + return m_options->kitName(b); + })); boardChooserlayout->addWidget(boardComboBox); mainLayout->addLayout(boardChooserlayout); @@ -83,6 +85,8 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(const McuSupportOptions *option m_packagesLayout = new QFormLayout; m_packagesGroupBox->setLayout(m_packagesLayout); + mainLayout->addStretch(1); + m_statusLabel = new QLabel; mainLayout->addWidget(m_statusLabel); m_statusLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); |