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

McuSupport: Fix qbs build and build with Qt5

Browse Source 
Amends 8c04c2ea55.

Change-Id: I27f2c900cddfd79b52d4989fa321e6f86177c89e
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Christian Stenger
2022-03-18 23:08:19 +01:00
parent 648e659356
commit 162fc2708c
5 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,10 +457,10 @@ QPair<Targets, Packages> targetsFromDescriptions(const QList<McuTargetDescriptio
if (isLegacy) {
auto [toolchainPkgs, vendorPkgs]{targetFactory->getAdditionalPackages()};
for (McuAbstractPackage *package : toolchainPkgs) {
mcuPackages.emplace_back(package);
mcuPackages.append(package);
}
for (McuAbstractPackage *package : vendorPkgs) {
mcuPackages.emplace_back(package);
mcuPackages.append(package);
}
}
return {mcuTargets, mcuPackages};
@@ -646,7 +646,9 @@ void targetsAndPackages(const Utils::FilePath &dir, McuSdkRepository *repo)
}
}
}
std::tie(repo->mcuTargets, repo->packages) = targetsFromDescriptions(descriptions, isLegacy);
const auto tmpTargetLists = targetsFromDescriptions(descriptions, isLegacy);
repo->mcuTargets = tmpTargetLists.first;
repo->packages = tmpTargetLists.second;
// Keep targets sorted lexicographically
std::sort(repo->mcuTargets.begin(),