ProjectExplorer: Remove toolchain settings compatibility with <= 4.3

As data point: Ubuntu 18.04 has Qt Creator 4.5.

Change-Id: I2794197e511666b3931fb8efc2669a574e6f1ac9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 1 insertions, 25 deletions

diff --git a/src/tools/sdktool/addtoolchainoperation.cpp b/src/tools/sdktool/addtoolchainoperation.cpp
index a5be70e877..d3eab51405 100644
--- a/src/tools/sdktool/addtoolchainoperation.cpp
+++ b/src/tools/sdktool/addtoolchainoperation.cpp
@@ -46,7 +46,6 @@ const char VERSION[] = "Version";
 const char ID[] = "ProjectExplorer.ToolChain.Id";
 const char DISPLAYNAME[] = "ProjectExplorer.ToolChain.DisplayName";
 const char AUTODETECTED[] = "ProjectExplorer.ToolChain.Autodetect";
-const char LANGUAGE_KEY[] = "ProjectExplorer.ToolChain.Language";
 const char LANGUAGE_KEY_V2[] = "ProjectExplorer.ToolChain.LanguageV2";
 
 // GCC ToolChain:
@@ -259,30 +258,7 @@ QVariantMap AddToolChainOperation::addToolChain(const QVariantMap &map, const QS
 
     KeyValuePairList data;
     data << KeyValuePair({tc, ID}, QVariant(id));
-
-    // Language compatibility hack for 4.2:
-    QString newLang; // QtC 4.3 and later
-    QString oldLang; // QtC 4.2
-    int langInt = lang.toInt(&ok);
-    Q_UNUSED(langInt)
-    if (lang == "2" || lang == "Cxx") {
-        newLang = "Cxx";
-        oldLang = "2";
-    } else if (lang == "1" || lang == "C") {
-        newLang = "C";
-        oldLang = "1";
-    } else if (ok) {
-        std::cerr << "Error: Language ID must be 1 for C, 2 for Cxx "
-                  << "or a string like (\"C\", \"Cxx\", \"Nim\", etc.)" << std::endl;
-        return {};
-    } else if (!ok) {
-        newLang = lang;
-        oldLang = "";
-    }
-    if (!oldLang.isEmpty())
-        data << KeyValuePair({tc, LANGUAGE_KEY}, QVariant(oldLang));
-    if (!newLang.isEmpty())
-        data << KeyValuePair({tc, LANGUAGE_KEY_V2}, QVariant(newLang));
+    data << KeyValuePair({tc, LANGUAGE_KEY_V2}, QVariant(lang));
     data << KeyValuePair({tc, DISPLAYNAME}, QVariant(displayName));
     data << KeyValuePair({tc, AUTODETECTED}, QVariant(true));
     data << KeyValuePair({tc, PATH}, QVariant(path));