diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2021-04-21 16:29:15 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-04-21 16:00:37 +0000 |
| commit | 7a8e7d86ade225a0f85d05ddb9dbce1a16e65b68 (patch) | |
| tree | 6018f8440ba621b2ea1b42cf53106a05e8fe5bc3 | |
| parent | c0a655b01ef8624521918259cc0a1e1bfc7e7863 (diff) | |
Fix toolchain registrationsv6.1.0-rc
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: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rwxr-xr-x | meta-boot2qt/files/configure-qtcreator.sh | 6 | ||||
| -rw-r--r-- | 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 a682ff0a..c7f7101b 100755 --- a/meta-boot2qt/files/configure-qtcreator.sh +++ b/meta-boot2qt/files/configure-qtcreator.sh @@ -1,7 +1,7 @@ #!/bin/bash ############################################################################ ## -## Copyright (C) 2020 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. @@ -109,14 +109,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 b24d6ccf..56aa2ac8 100644 --- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs +++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs @@ -81,7 +81,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"]); @@ -91,7 +91,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++"]); |