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

McuSupport: Move global toolchain type mapping to function

Browse Source 
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>
This commit is contained in:
Piotr Mućko
2022-08-10 16:23:56 +02:00
parent bc19a26c06
commit e31016ccc3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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) McuPackageVersionDetector *createVersionDetection(const VersionDetection &versionDetection)
{ {
if (!versionDetection.xmlElement.isEmpty() && !versionDetection.xmlAttribute.isEmpty()) if (!versionDetection.xmlElement.isEmpty() && !versionDetection.xmlAttribute.isEmpty())
@@ -183,6 +173,16 @@ McuPackagePtr McuTargetFactory::createPackage(const PackageDescription &pkgDesc)
McuToolChainPackage *McuTargetFactory::createToolchain( McuToolChainPackage *McuTargetFactory::createToolchain(
const McuTargetDescription::Toolchain &toolchain) 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}; const PackageDescription compilerDescription{toolchain.compiler};
McuToolChainPackage::ToolChainType toolchainType McuToolChainPackage::ToolChainType toolchainType