diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-05-08 22:16:44 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-05-09 12:01:25 +0000 |
| commit | f39e701c56fbad1e12e05c63d18eca80f57adbd6 (patch) | |
| tree | 74fafe0cc6747c644b253c9c15f30c6b4d222fbd /src/plugins/baremetal | |
| parent | e0d38ae4140d6101b483fde25158fc94b34a3a64 (diff) | |
bare-metal: Fix language name in auto-detected toolchains
We need to display the language display name instead of language id.
Change-Id: I94b03acf9ea3047054a98dadb333b5912d5ad059
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/baremetal')
| -rw-r--r-- | src/plugins/baremetal/iarewtoolchain.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/baremetal/keiltoolchain.cpp | 4 | ||||
| -rw-r--r-- | src/plugins/baremetal/sdcctoolchain.cpp | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index 3fa0c2af419..330668eb25f 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -214,8 +214,10 @@ static Abi guessAbi(const Macros ¯os) static QString buildDisplayName(Abi::Architecture arch, Core::Id language, const QString &version) { + const auto archName = Abi::toString(arch); + const auto langName = ToolChainManager::displayNameOfLanguageId(language); return IarToolChain::tr("IAREW %1 (%2, %3)") - .arg(version, language.toString(), Abi::toString(arch)); + .arg(version, langName, archName); } // IarToolChain diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index 19f74472667..489bc89f2f7 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -231,8 +231,10 @@ static Abi guessAbi(const Macros ¯os) static QString buildDisplayName(Abi::Architecture arch, Core::Id language, const QString &version) { + const auto archName = Abi::toString(arch); + const auto langName = ToolChainManager::displayNameOfLanguageId(language); return KeilToolchain::tr("KEIL %1 (%2, %3)") - .arg(version, language.toString(), Abi::toString(arch)); + .arg(version, langName, archName); } // KeilToolchain diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp index 412d03a1e95..c752a9b230a 100644 --- a/src/plugins/baremetal/sdcctoolchain.cpp +++ b/src/plugins/baremetal/sdcctoolchain.cpp @@ -202,8 +202,10 @@ static Abi guessAbi(const Macros ¯os) static QString buildDisplayName(Abi::Architecture arch, Core::Id language, const QString &version) { + const auto archName = Abi::toString(arch); + const auto langName = ToolChainManager::displayNameOfLanguageId(language); return SdccToolChain::tr("SDCC %1 (%2, %3)") - .arg(version, language.toString(), Abi::toString(arch)); + .arg(version, langName, archName); } static Utils::FileName compilerPathFromEnvironment(const QString &compilerName) |