McuSupport: Fix qbs build and build with Qt5

Amends 8c04c2ea55.

Change-Id: I27f2c900cddfd79b52d4989fa321e6f86177c89e
Reviewed-by: Piotr Mućko <piotr.mucko@qt.io>
Reviewed-by: hjk <hjk@qt.io>

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",

src/plugins/mcusupport/mcusupportsdk.cpp

@@ -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(),

src/plugins/mcusupport/mcutargetfactory.cpp

@@ -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),
+        mcuTargets.append(new McuTarget{QVersionNumber::fromString(desc.qulVersion),
-                                              platform,
+                                        platform,
-                                              deduceOperatingSystem(desc),
+                                        deduceOperatingSystem(desc),
-                                              targetPackages,
+                                        targetPackages,
-                                              new McuToolChainPackage{{}, {}, {}, {}, {}},
+                                        new McuToolChainPackage{{}, {}, {}, {}, {}},
-                                              colorDepth});
+                                        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,

src/plugins/mcusupport/mcutargetfactorylegacy.cpp

@@ -53,36 +53,36 @@ QPair<Targets, Packages> 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);
+                McuAbstractPackage *boardSdkPkg = createBoardSdkPackage(desc);
-                boardSdkPkgs.emplace(desc.boardSdk.envVar, boardSdkPkg);
+                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);

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"};