From c65648e1dc6e4f2a5e70fe4b1856f839b680831a Mon Sep 17 00:00:00 2001
From: Samuli Piippo <samuli.piippo@qt.io>
Date: Wed, 21 Apr 2021 16:29:15 +0300
Subject: Fix toolchain registrations

sdktool has changed the syntax for the C and C++ compiler registrations
to Qt Creator. Instead of language 1 and 2, they are now C and Cxx.

Task-number: QTBUG-92949
Change-Id: I7e9130e57527b2fdb8e6b7fae546bfee46e52c3b
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit 8039e46f428dd3e7a2ad8c7fbc059a65350b7a9f)
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 meta-boot2qt/files/configure-qtcreator.sh          | 6 +++---
 meta-boot2qt/files/qbsp/toolchain_installscript.qs | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh
index 6899fc3e..7a899fa0 100755
--- a/meta-boot2qt/files/configure-qtcreator.sh
+++ b/meta-boot2qt/files/configure-qtcreator.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 ############################################################################
 ##
-## Copyright (C) 2016 The Qt Company Ltd.
+## Copyright (C) 2021 The Qt Company Ltd.
 ## Contact: https://www.qt.io/licensing/
 ##
 ## This file is part of the Boot to Qt meta layer.
@@ -116,14 +116,14 @@ ${SDKTOOL} addTC \
     --name "GCC (${NAME})" \
     --path "$(type -p ${CC})" \
     --abi "${ABI}" \
-    --language 1
+    --language C
 
 ${SDKTOOL} addTC \
     --id "ProjectExplorer.ToolChain.Gcc:${BASEID}.g++" \
     --name "G++ (${NAME})" \
     --path "$(type -p ${CXX})" \
     --abi "${ABI}" \
-    --language 2
+    --language Cxx
 
 ${SDKTOOL} addDebugger \
     --id "${BASEID}.gdb" \
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
index 8b2dabf2..795ed996 100644
--- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs
+++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs
@@ -86,7 +86,7 @@ Component.prototype.createOperations = function()
         "--name", "GCC (" + platform + " " + target + ")",
         "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-gcc" + executableExt,
         "--abi", abi,
-        "--language", "1",
+        "--language", "C",
         "UNDOEXECUTE",
         "@SDKToolBinary@", "rmTC", "--id", toolchainId + ".gcc"]);
 
@@ -96,7 +96,7 @@ Component.prototype.createOperations = function()
         "--name", "G++ (" + platform + " " + target + ")",
         "--path", path + "/sysroots/" + hostSysroot + "/usr/bin/" + target_sys + "/" + target_sys + "-g++" + executableExt,
         "--abi", abi,
-        "--language", "2",
+        "--language", "Cxx",
         "UNDOEXECUTE",
         "@SDKToolBinary@", "rmTC", "--id", toolchainId + ".g++"]);
 
-- 
cgit v1.2.3