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

Merge remote-tracking branch 'origin/9.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/clangcodemodel/clangdcompletion.cpp

Change-Id: Iaa92bf057d7696d2da10802ff95e80863f3235d8
This commit is contained in:
Eike Ziller
2022-11-14 15:26:20 +01:00
parent 09ee528c40 993815cb06
commit 3f0f9a63c0
50 changed files with 1629 additions and 1519 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -247,6 +247,15 @@ void McuSupportOptionsWidget::updateStatus()
}
}
struct McuPackageSort {
bool operator()(McuPackagePtr a, McuPackagePtr b) const {
if (a->cmakeVariableName() != b->cmakeVariableName())
return a->cmakeVariableName() > b->cmakeVariableName();
else
return a->environmentVariableName() > b->environmentVariableName();
}
};
void McuSupportOptionsWidget::showMcuTargetPackages()
{
McuTargetPtr mcuTarget = currentMcuTarget();
@@ -257,9 +266,15 @@ void McuSupportOptionsWidget::showMcuTargetPackages()
m_packagesLayout->removeRow(0);
}
std::set<McuPackagePtr, McuPackageSort> packages;
for (const auto &package : mcuTarget->packages()) {
if (package->label().isEmpty())
continue;
packages.insert(package);
}
for (const auto &package : packages) {
QWidget *packageWidget = package->widget();
m_packagesLayout->addRow(package->label(), packageWidget);
packageWidget->show();