Merge remote-tracking branch 'origin/4.15'

Change-Id: I75ffc79eeb8d73296a2271a636fae48e35427947

1 files changed, 12 insertions, 0 deletions

diff --git a/src/plugins/projectexplorer/toolchain.h b/src/plugins/projectexplorer/toolchain.h
index 22042c8642..40c9db98b2 100644
--- a/src/plugins/projectexplorer/toolchain.h
+++ b/src/plugins/projectexplorer/toolchain.h
@@ -52,6 +52,18 @@ namespace ProjectExplorer {
 
 namespace Internal { class ToolChainPrivate; }
 
+namespace Deprecated {
+// Deprecated in 4.3:
+namespace Toolchain {
+enum Language {
+    None = 0,
+    C,
+    Cxx
+};
+QString languageId(Language l);
+} // namespace Toolchain
+} // namespace Deprecated
+
 class ToolChainConfigWidget;
 class ToolChainFactory;
 class Kit;