From 162fc2708c56c916e0d788aa2ffaabba908830bf Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Fri, 18 Mar 2022 23:08:19 +0100 Subject: [PATCH] McuSupport: Fix qbs build and build with Qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amends 8c04c2ea5560b. Change-Id: I27f2c900cddfd79b52d4989fa321e6f86177c89e Reviewed-by: Piotr Mućko Reviewed-by: hjk --- src/plugins/mcusupport/mcusupport.qbs | 2 -- src/plugins/mcusupport/mcusupportsdk.cpp | 8 +++++--- src/plugins/mcusupport/mcutargetfactory.cpp | 14 +++++++------- src/plugins/mcusupport/mcutargetfactorylegacy.cpp | 14 +++++++------- src/plugins/mcusupport/test/unittest.cpp | 3 ++- 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/src/plugins/mcusupport/mcusupport.qbs b/src/plugins/mcusupport/mcusupport.qbs index ba91c5e7f14..b7c74ac5c8d 100644 --- a/src/plugins/mcusupport/mcusupport.qbs +++ b/src/plugins/mcusupport/mcusupport.qbs @@ -27,8 +27,6 @@ QtcPlugin { "mcutargetfactory.h", "mcutargetfactorylegacy.cpp", "mcutargetfactorylegacy.h", - "mcutargetfactory.cpp", - "mcutargetfactory.h", "mcusupport.qrc", "mcusupport_global.h", "mcusupportconstants.h", diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index e4c1f2b48cf..8ac324b817a 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -457,10 +457,10 @@ QPair targetsFromDescriptions(const QListgetAdditionalPackages()}; 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(), diff --git a/src/plugins/mcusupport/mcutargetfactory.cpp b/src/plugins/mcusupport/mcutargetfactory.cpp index a01def4f8f5..bc68c47e0a1 100644 --- a/src/plugins/mcusupport/mcutargetfactory.cpp +++ b/src/plugins/mcusupport/mcutargetfactory.cpp @@ -44,12 +44,12 @@ QPair 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 packageDescriptions = aggregatePackageEntries(desc); for (const PackageDescription &pkgDesc : packageDescriptions) { - packages.emplace_back(new McuPackage{ + packages.append(new McuPackage{ pkgDesc.label, pkgDesc.defaultPath, pkgDesc.validationPath, diff --git a/src/plugins/mcusupport/mcutargetfactorylegacy.cpp b/src/plugins/mcusupport/mcutargetfactorylegacy.cpp index e1dfe80f6a2..adbd9ac0c0a 100644 --- a/src/plugins/mcusupport/mcutargetfactorylegacy.cpp +++ b/src/plugins/mcusupport/mcutargetfactorylegacy.cpp @@ -53,36 +53,36 @@ QPair McuTargetFactoryLegacy::createTargets(const McuTargetDe // Desktop toolchains don't need any additional settings if (tcPkg && !tcPkg->isDesktopToolchain() && tcPkg->toolchainType() != McuToolChainPackage::ToolChainType::Unsupported) { - required3rdPartyPkgs.emplace_back(tcPkg); + required3rdPartyPkgs.append(tcPkg); } // Add setting specific to platform IDE. if (vendorPkgs.contains(desc.platform.vendor)) { - required3rdPartyPkgs.emplace_back(vendorPkgs.value(desc.platform.vendor)); + required3rdPartyPkgs.append(vendorPkgs.value(desc.platform.vendor)); } // Board SDK specific settings Utils::FilePath boardSdkDefaultPath; if (!desc.boardSdk.envVar.isEmpty()) { if (!boardSdkPkgs.contains(desc.boardSdk.envVar)) { - const McuAbstractPackage *boardSdkPkg = createBoardSdkPackage(desc); - boardSdkPkgs.emplace(desc.boardSdk.envVar, boardSdkPkg); + McuAbstractPackage *boardSdkPkg = createBoardSdkPackage(desc); + boardSdkPkgs.insert(desc.boardSdk.envVar, boardSdkPkg); } McuAbstractPackage *boardSdkPkg{boardSdkPkgs.value(desc.boardSdk.envVar)}; boardSdkPkg->setVersions(desc.boardSdk.versions); boardSdkDefaultPath = boardSdkPkg->defaultPath(); - required3rdPartyPkgs.emplace_back(boardSdkPkg); + required3rdPartyPkgs.append(boardSdkPkg); } // Free RTOS specific settings. if (!desc.freeRTOS.envVar.isEmpty()) { if (!freeRTOSPkgs.contains(desc.freeRTOS.envVar)) { - freeRTOSPkgs.emplace(desc.freeRTOS.envVar, + freeRTOSPkgs.insert(desc.freeRTOS.envVar, createFreeRTOSSourcesPackage(desc.freeRTOS.envVar, boardSdkDefaultPath, desc.freeRTOS.boardSdkSubDir)); } - required3rdPartyPkgs.emplace_back(freeRTOSPkgs.value(desc.freeRTOS.envVar)); + required3rdPartyPkgs.append(freeRTOSPkgs.value(desc.freeRTOS.envVar)); } packages.append(required3rdPartyPkgs); diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index 7c11a1de186..59a53fa5344 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -62,7 +62,8 @@ const QString stm32f7{"STM32F7"}; const QString nxp1170{"EVK_MIMXRT1170"}; const QString nxp1050{"IMXRT1050"}; const QString nxp1064{"IMXRT1064"}; -const QStringList jsonFiles{armgcc_nxp_1050_json, armgcc_nxp_1064_json}; +const QStringList jsonFiles{QString::fromUtf8(armgcc_nxp_1050_json), + QString::fromUtf8(armgcc_nxp_1064_json)}; constexpr bool RUN_LEGACY{true}; constexpr int colorDepth{32}; const QString id{"id"};