17 files changed, 86 insertions, 26 deletions
diff --git a/src/plugins/madde/maemotoolchain.cpp b/src/plugins/madde/maemotoolchain.cpp
index ef6a8afe2f..352ab40c98 100644
--- a/src/plugins/madde/maemotoolchain.cpp
+++ b/src/plugins/madde/maemotoolchain.cpp
@@ -74,7 +74,12 @@ MaemoToolChain::MaemoToolChain(const MaemoToolChain &tc) :
 MaemoToolChain::~MaemoToolChain()
 { }
 
-QString MaemoToolChain::typeName() const
+QString MaemoToolChain::type() const
+{
+    return QLatin1String("maemogcc");
+}
+
+QString MaemoToolChain::typeDisplayName() const
 {
     return MaemoToolChainFactory::tr("Maemo GCC");
 }
diff --git a/src/plugins/madde/maemotoolchain.h b/src/plugins/madde/maemotoolchain.h
index b1694d4eac..8773656bc4 100644
--- a/src/plugins/madde/maemotoolchain.h
+++ b/src/plugins/madde/maemotoolchain.h
@@ -48,7 +48,8 @@ class MaemoToolChain : public ProjectExplorer::GccToolChain
 public:
     ~MaemoToolChain();
 
-    QString typeName() const;
+    QString type() const;
+    QString typeDisplayName() const;
     Utils::FileName mkspec() const;
 
     bool isValid() const;
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 0319a8e79a..8a14b46e33 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -304,8 +304,8 @@ GccToolChain::GccToolChain(const GccToolChain &tc) :
 QString GccToolChain::defaultDisplayName() const
 {
     if (!m_targetAbi.isValid())
-        return typeName();
-    return QString::fromLatin1("%1 (%2 %3)").arg(typeName(),
+        return typeDisplayName();
+    return QString::fromLatin1("%1 (%2 %3)").arg(typeDisplayName(),
                                                  ProjectExplorer::Abi::toString(m_targetAbi.architecture()),
                                                  ProjectExplorer::Abi::toString(m_targetAbi.wordWidth()));
 }
@@ -327,7 +327,12 @@ QString GccToolChain::legacyId() const
                .arg(m_targetAbi.toString()).arg(m_debuggerCommand.toString());
 }
 
-QString GccToolChain::typeName() const
+QString GccToolChain::type() const
+{
+    return QLatin1String("gcc");
+}
+
+QString GccToolChain::typeDisplayName() const
 {
     return Internal::GccToolChainFactory::tr("GCC");
 }
@@ -770,7 +775,12 @@ ClangToolChain::ClangToolChain(bool autodetect) :
     GccToolChain(QLatin1String(Constants::CLANG_TOOLCHAIN_ID), autodetect)
 { }
 
-QString ClangToolChain::typeName() const
+QString ClangToolChain::type() const
+{
+    return QLatin1String("clang");
+}
+
+QString ClangToolChain::typeDisplayName() const
 {
     return Internal::ClangToolChainFactory::tr("Clang");
 }
@@ -862,7 +872,12 @@ MingwToolChain::MingwToolChain(bool autodetect) :
     GccToolChain(QLatin1String(Constants::MINGW_TOOLCHAIN_ID), autodetect)
 { }
 
-QString MingwToolChain::typeName() const
+QString MingwToolChain::type() const
+{
+    return QLatin1String("mingw");
+}
+
+QString MingwToolChain::typeDisplayName() const
 {
     return Internal::MingwToolChainFactory::tr("MinGW");
 }
@@ -951,7 +966,12 @@ LinuxIccToolChain::LinuxIccToolChain(bool autodetect) :
     GccToolChain(QLatin1String(Constants::LINUXICC_TOOLCHAIN_ID), autodetect)
 { }
 
-QString LinuxIccToolChain::typeName() const
+QString LinuxIccToolChain::type() const
+{
+    return QLatin1String("icc");
+}
+
+QString LinuxIccToolChain::typeDisplayName() const
 {
     return Internal::LinuxIccToolChainFactory::tr("Linux ICC");
 }
diff --git a/src/plugins/projectexplorer/gcctoolchain.h b/src/plugins/projectexplorer/gcctoolchain.h
index c9ce3ad7b3..1d81ef3b19 100644
--- a/src/plugins/projectexplorer/gcctoolchain.h
+++ b/src/plugins/projectexplorer/gcctoolchain.h
@@ -56,7 +56,8 @@ class PROJECTEXPLORER_EXPORT GccToolChain : public ToolChain
 public:
     QString legacyId() const;
 
-    QString typeName() const;
+    QString type() const;
+    QString typeDisplayName() const;
     Abi targetAbi() const;
     QString version() const;
     QList<Abi> supportedAbis() const;
@@ -121,7 +122,8 @@ private:
 class PROJECTEXPLORER_EXPORT ClangToolChain : public GccToolChain
 {
 public:
-    QString typeName() const;
+    QString type() const;
+    QString typeDisplayName() const;
     QString makeCommand() const;
     Utils::FileName mkspec() const;
 
@@ -143,7 +145,8 @@ private:
 class PROJECTEXPLORER_EXPORT MingwToolChain : public GccToolChain
 {
 public:
-    QString typeName() const;
+    QString type() const;
+    QString typeDisplayName() const;
     Utils::FileName mkspec() const;
     QString makeCommand() const;
 
@@ -163,8 +166,8 @@ private:
 class PROJECTEXPLORER_EXPORT LinuxIccToolChain : public GccToolChain
 {
 public:
-
-    QString typeName() const;
+    QString type() const;
+    QString typeDisplayName() const;
 
     IOutputParser *outputParser() const;
 
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp
index 26e5e3818d..5874ca148b 100644
--- a/src/plugins/projectexplorer/msvctoolchain.cpp
+++ b/src/plugins/projectexplorer/msvctoolchain.cpp
@@ -318,7 +318,12 @@ QString MsvcToolChain::legacyId() const
     return id;
 }
 
-QString MsvcToolChain::typeName() const
+QString MsvcToolChain::type() const
+{
+    return QLatin1String("msvc");
+}
+
+QString MsvcToolChain::typeDisplayName() const
 {
     return MsvcToolChainFactory::tr("MSVC");
 }
diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h
index 3ecd49eb51..daa6b70e2b 100644
--- a/src/plugins/projectexplorer/msvctoolchain.h
+++ b/src/plugins/projectexplorer/msvctoolchain.h
@@ -60,7 +60,8 @@ public:
 
     static MsvcToolChain *readFromMap(const QVariantMap &data);
 
-    QString typeName() const;
+    QString type() const;
+    QString typeDisplayName() const;
     Utils::FileName mkspec() const;
 
     QVariantMap toMap() const;
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index cad5f70b7a..4fc343d86d 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -107,7 +107,7 @@ ToolChain::~ToolChain()
 QString ToolChain::displayName() const
 {
     if (d->m_displayName.isEmpty())
-        return typeName();
+        return typeDisplayName();
     return d->m_displayName;
 }
 
diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index 61dc2b585c..a6a0564ed2 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -75,7 +75,8 @@ public:
     // No need to implement this for new tool chains:
     virtual QString legacyId() const { return QString(); }
 
-    virtual QString typeName() const = 0;
+    virtual QString type() const = 0;
+    virtual QString typeDisplayName() const = 0;
     virtual Abi targetAbi() const = 0;
 
     virtual bool isValid() const = 0;
diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp
index 5b09240bfe..50a57a7fa2 100644
--- a/src/plugins/projectexplorer/toolchainoptionspage.cpp
+++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp
@@ -194,7 +194,7 @@ QVariant ToolChainModel::data(const QModelIndex &index, int role) const
                 return node->newName.isEmpty() ?
                     node->toolChain->displayName() : node->newName;
             }
-            return node->toolChain->typeName();
+            return node->toolChain->typeDisplayName();
         }
         if (role == Qt::ToolTipRole) {
             return tr("<nobr><b>ABI:</b> %1")
diff --git a/src/plugins/projectexplorer/wincetoolchain.cpp b/src/plugins/projectexplorer/wincetoolchain.cpp
index 87a2d834e7..2d324e782e 100644
--- a/src/plugins/projectexplorer/wincetoolchain.cpp
+++ b/src/plugins/projectexplorer/wincetoolchain.cpp
@@ -295,7 +295,12 @@ QString WinCEToolChain::legacyId() const
     return id;
 }
 
-QString WinCEToolChain::typeName() const
+QString WinCEToolChain::type() const
+{
+    return QLatin1String("wince");
+}
+
+QString WinCEToolChain::typeDisplayName() const
 {
     return WinCEToolChainFactory::tr("WinCE");
 }
diff --git a/src/plugins/projectexplorer/wincetoolchain.h b/src/plugins/projectexplorer/wincetoolchain.h
index 603c86d2a1..ea1a7203f4 100644
--- a/src/plugins/projectexplorer/wincetoolchain.h
+++ b/src/plugins/projectexplorer/wincetoolchain.h
@@ -61,7 +61,8 @@ public:
 
     static WinCEToolChain *readFromMap(const QVariantMap &data);
 
-    QString typeName() const;
+    QString type() const;
+    QString typeDisplayName() const;
 
     Utils::FileName mkspec() const;
 
diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
index 7442d4ff74..efe2784edb 100644
--- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.cpp
@@ -84,7 +84,12 @@ static QString gcceVersion(const QString &command)
 // GcceToolChain
 // ==========================================================================
 
-QString GcceToolChain::typeName() const
+QString GcceToolChain::type() const
+{
+    return QLatin1String("gcce");
+}
+
+QString GcceToolChain::typeDisplayName() const
 {
     return GcceToolChainFactory::tr("GCCE");
 }
diff --git a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h
index b901d244dd..844990fa9e 100644
--- a/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h
+++ b/src/plugins/qt4projectmanager/qt-s60/gccetoolchain.h
@@ -45,7 +45,8 @@ namespace Internal {
 class GcceToolChain : public ProjectExplorer::GccToolChain
 {
 public:
-    QString typeName() const;
+    QString type() const;
+    QString typeDisplayName() const;
 
     QByteArray predefinedMacros() const;
     void addToEnvironment(Utils::Environment &env) const;
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
index 9d04513868..59cd590202 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.cpp
@@ -143,7 +143,12 @@ RvctToolChain::RvctVersion RvctToolChain::version(const QString &rvctPath)
     return v;
 }
 
-QString RvctToolChain::typeName() const
+QString RvctToolChain::type() const
+{
+    return QLatin1String("rvct");
+}
+
+QString RvctToolChain::typeDisplayName() const
 {
     return RvctToolChainFactory::tr("RVCT");
 }
diff --git a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
index 3f0468beea..984496f8d2 100644
--- a/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
+++ b/src/plugins/qt4projectmanager/qt-s60/rvcttoolchain.h
@@ -81,7 +81,8 @@ public:
 
     enum ArmVersion { ARMv5, ARMv6 };
 
-    QString typeName() const;
+    QString type() const;
+    QString typeDisplayName() const;
     ProjectExplorer::Abi targetAbi() const;
 
     QString legacyId() const;
diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
index f0ff7e7cfc..1484ebf3f6 100644
--- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.cpp
@@ -135,7 +135,12 @@ WinscwToolChain::WinscwToolChain(const WinscwToolChain &tc) :
 WinscwToolChain::~WinscwToolChain()
 { }
 
-QString WinscwToolChain::typeName() const
+QString WinscwToolChain::type() const
+{
+    return QLatin1String("winscw");
+}
+
+QString WinscwToolChain::typeDisplayName() const
 {
     return WinscwToolChainFactory::tr("WINSCW");
 }
diff --git a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h
index 5dc78d1619..25a9e14135 100644
--- a/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h
+++ b/src/plugins/qt4projectmanager/qt-s60/winscwtoolchain.h
@@ -52,7 +52,8 @@ public:
     WinscwToolChain(const WinscwToolChain &);
     ~WinscwToolChain();
 
-    QString typeName() const;
+    QString type() const;
+    QString typeDisplayName() const;
     ProjectExplorer::Abi targetAbi() const;
     QString legacyId() const;