From e31016ccc3f6e07d76af9a7ee028c84e2e83f658 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20Mu=C4=87ko?= <piotr.mucko@qt.io>
Date: Wed, 10 Aug 2022 16:23:56 +0200
Subject: [PATCH] McuSupport: Move global toolchain type mapping to function

Change-Id: Ibe11c574d3427fa7f38f1e4df30400ec3d11294b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Yasser Grimes <yasser.grimes@qt.io>
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/mcusupport/mcutargetfactory.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/plugins/mcusupport/mcutargetfactory.cpp b/src/plugins/mcusupport/mcutargetfactory.cpp
index 09c4583c2cd..883e0d6f06e 100644
--- a/src/plugins/mcusupport/mcutargetfactory.cpp
+++ b/src/plugins/mcusupport/mcutargetfactory.cpp
@@ -50,16 +50,6 @@ bool isDesktopToolchain(McuToolChainPackage::ToolChainType type)
 }
 
 
-const static QMap<QString, McuToolChainPackage::ToolChainType> toolchainTypeMapping{
-    {"iar", McuToolChainPackage::ToolChainType::IAR},
-    {"keil", McuToolChainPackage::ToolChainType::KEIL},
-    {"msvc", McuToolChainPackage::ToolChainType::MSVC},
-    {"gcc", McuToolChainPackage::ToolChainType::GCC},
-    {"armgcc", McuToolChainPackage::ToolChainType::ArmGcc},
-    {"ghs", McuToolChainPackage::ToolChainType::GHS},
-    {"ghsarm", McuToolChainPackage::ToolChainType::GHSArm},
-};
-
 McuPackageVersionDetector *createVersionDetection(const VersionDetection &versionDetection)
 {
     if (!versionDetection.xmlElement.isEmpty() && !versionDetection.xmlAttribute.isEmpty())
@@ -183,6 +173,16 @@ McuPackagePtr McuTargetFactory::createPackage(const PackageDescription &pkgDesc)
 McuToolChainPackage *McuTargetFactory::createToolchain(
     const McuTargetDescription::Toolchain &toolchain)
 {
+    const static QMap<QString, McuToolChainPackage::ToolChainType> toolchainTypeMapping{
+        {"iar", McuToolChainPackage::ToolChainType::IAR},
+        {"keil", McuToolChainPackage::ToolChainType::KEIL},
+        {"msvc", McuToolChainPackage::ToolChainType::MSVC},
+        {"gcc", McuToolChainPackage::ToolChainType::GCC},
+        {"armgcc", McuToolChainPackage::ToolChainType::ArmGcc},
+        {"ghs", McuToolChainPackage::ToolChainType::GHS},
+        {"ghsarm", McuToolChainPackage::ToolChainType::GHSArm},
+    };
+
     const PackageDescription compilerDescription{toolchain.compiler};
 
     McuToolChainPackage::ToolChainType toolchainType