feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

McuSupport: Distinguish "Evaluation" and "Engineering" roles

Browse Source 
"Evaluation" and "Engineering" kits need to be set up differently.

Change-Id: I649fed9cbdff248c5cbc69e65a095ced1f25326e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Alessandro Portale
2019-11-12 13:58:23 +01:00
parent ce83b2a93c
commit 9641de2007
2 changed files with 35 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/plugins/mcusupport/mcusupportoptions.cpp
View File

@@ -351,24 +351,41 @@ McuSupportOptions::McuSupportOptions(QObject *parent)
toolchainPackage = armGccPackage; toolchainPackage = armGccPackage;
auto stmEvalPackages = {
auto stmPackages = {armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage, armGccPackage, stm32CubeProgrammerPackage, qulPackage};
auto stmEngPackages = {
armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage, qulPackage};
auto nxpEvalPackages = {
armGccPackage, seggerJLinkPackage, qulPackage};
auto nxpEngPackages = {
armGccPackage, evkbImxrt1050SdkPackage, seggerJLinkPackage, qulPackage};
auto desktopPackages = {
qulPackage}; qulPackage};
auto nxpPackages = {armGccPackage, evkbImxrt1050SdkPackage, seggerJLinkPackage, packages = {
qulPackage}; armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage, evkbImxrt1050SdkPackage,
auto desktopPackages = {qulPackage}; seggerJLinkPackage, qulPackage};
packages = {armGccPackage, stm32CubeFwF7SdkPackage, stm32CubeProgrammerPackage,
evkbImxrt1050SdkPackage, seggerJLinkPackage, qulPackage};
const QString vendorStm = "STM"; const QString vendorStm = "STM";
const QString vendorNxp = "NXP"; const QString vendorNxp = "NXP";
const QString vendorQt = "Qt"; const QString vendorQt = "Qt";
boards.append(new BoardOptions(vendorStm, boards.append(new BoardOptions(vendorStm,
"stm32f7508", "CMake/stm32f7508-discovery.cmake", "", stmPackages)); "stm32f7508",
"CMake/stm32f7508-discovery.cmake", "", stmEvalPackages));
boards.append(new BoardOptions(vendorStm, boards.append(new BoardOptions(vendorStm,
"stm32f769i", "CMake/stm32f769i-discovery.cmake", "", stmPackages)); "stm32f769i",
"CMake/stm32f769i-discovery.cmake", "", stmEvalPackages));
boards.append(new BoardOptions(vendorStm,
"Engineering",
"CMake/<toolchain file>", "", stmEngPackages));
boards.append(new BoardOptions(vendorNxp, boards.append(new BoardOptions(vendorNxp,
"evkbimxrt1050", "CMake/evkbimxrt1050-toolchain.cmake", "", nxpPackages)); "evkbimxrt1050",
"CMake/evkbimxrt1050-toolchain.cmake", "", nxpEvalPackages));
boards.append(new BoardOptions(vendorNxp,
"Engineering",
"CMake/<toolchain file>", "", nxpEngPackages));
boards.append(new BoardOptions(vendorQt, boards.append(new BoardOptions(vendorQt,
"Desktop", "", "Qt", desktopPackages)); "Desktop", "", "Qt", desktopPackages));

8
src/plugins/mcusupport/mcusupportoptionspage.cpp
View File

@@ -73,8 +73,10 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(const McuSupportOptions *option
auto boardComboBox = new QComboBox; auto boardComboBox = new QComboBox;
boardChooserLabel->setBuddy(boardComboBox); boardChooserLabel->setBuddy(boardComboBox);
boardChooserLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred); boardChooserLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
boardComboBox->addItems(Utils::transform<QStringList>(m_options->boards, [](BoardOptions *b){ boardComboBox->addItems(
return b->model();})); Utils::transform<QStringList>(m_options->boards, [this](BoardOptions *b){
return m_options->kitName(b);
}));
boardChooserlayout->addWidget(boardComboBox); boardChooserlayout->addWidget(boardComboBox);
mainLayout->addLayout(boardChooserlayout); mainLayout->addLayout(boardChooserlayout);
@@ -83,6 +85,8 @@ McuSupportOptionsWidget::McuSupportOptionsWidget(const McuSupportOptions *option
m_packagesLayout = new QFormLayout; m_packagesLayout = new QFormLayout;
m_packagesGroupBox->setLayout(m_packagesLayout); m_packagesGroupBox->setLayout(m_packagesLayout);
mainLayout->addStretch(1);
m_statusLabel = new QLabel; m_statusLabel = new QLabel;
mainLayout->addWidget(m_statusLabel); mainLayout->addWidget(m_statusLabel);
m_statusLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_statusLabel->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);