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

ToolChains: Make language part of the default toolchain name

Browse Source 
Change-Id: I9f8a4ad79316d0cb6e0de40fa4a8b9dd4fa6e33d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2016-12-16 13:40:00 +01:00
parent c41404728a
commit 82c1488bcc
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/android/androidtoolchain.cpp
View File

@@ -69,9 +69,10 @@ AndroidToolChain::AndroidToolChain(const Abi &abi, const QString &ndkToolChainVe
{ {
setLanguage(l); setLanguage(l);
setTargetAbi(abi); setTargetAbi(abi);
setDisplayName(QString::fromLatin1("Android GCC (%1-%2)") setDisplayName(QString::fromLatin1("Android GCC (%1, %2-%3)")
.arg(AndroidConfig::displayName(targetAbi())) .arg(ToolChain::languageDisplayName(l),
.arg(ndkToolChainVersion)); AndroidConfig::displayName(targetAbi()),
ndkToolChainVersion));
} }
// for fromMap // for fromMap

9
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -288,10 +288,11 @@ QString GccToolChain::defaultDisplayName() const
if (!m_targetAbi.isValid()) if (!m_targetAbi.isValid())
return typeDisplayName(); return typeDisplayName();
return QCoreApplication::translate("ProjectExplorer::GccToolChain", return QCoreApplication::translate("ProjectExplorer::GccToolChain",
"%1 (%2 %3 in %4)").arg(typeDisplayName(), "%1 (%2, %3 %4 in %5)").arg(typeDisplayName(),
Abi::toString(m_targetAbi.architecture()), ToolChain::languageDisplayName(language()),
Abi::toString(m_targetAbi.wordWidth()), Abi::toString(m_targetAbi.architecture()),
compilerCommand().parentDir().toUserOutput()); Abi::toString(m_targetAbi.wordWidth()),
compilerCommand().parentDir().toUserOutput());
} }
ToolChain::CompilerFlags GccToolChain::defaultCompilerFlags() const ToolChain::CompilerFlags GccToolChain::defaultCompilerFlags() const