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

14
src/plugins/mcusupport/mcutargetfactory.cpp
View File

@@ -44,12 +44,12 @@ QPair<Targets, Packages> McuTargetFactory::createTargets(const McuTargetDescript
Packages targetPackages = createPackages(desc);
packages.append(targetPackages);
mcuTargets.emplace_back(new McuTarget{QVersionNumber::fromString(desc.qulVersion),
platform,
deduceOperatingSystem(desc),
targetPackages,
new McuToolChainPackage{{}, {}, {}, {}, {}},
colorDepth});
mcuTargets.append(new McuTarget{QVersionNumber::fromString(desc.qulVersion),
platform,
deduceOperatingSystem(desc),
targetPackages,
new McuToolChainPackage{{}, {}, {}, {}, {}},
colorDepth});
}
return {mcuTargets, packages};
}
@@ -69,7 +69,7 @@ Packages McuTargetFactory::createPackages(const McuTargetDescription &desc)
QList<PackageDescription> packageDescriptions = aggregatePackageEntries(desc);
for (const PackageDescription &pkgDesc : packageDescriptions) {
packages.emplace_back(new McuPackage{
packages.append(new McuPackage{
pkgDesc.label,
pkgDesc.defaultPath,
pkgDesc.validationPath,