diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2022-02-07 14:38:09 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-02-08 07:47:09 +0000 |
| commit | 13596ab483dcafe74454646f99aeb098b6f15606 (patch) | |
| tree | 550ceb5cbec651469ff05d417d3d1dcf6dd717f5 | |
| parent | 8332dabb6957ab1c8d58105519a0da9603c202b3 (diff) | |
qbsp: use correct toolchain file
SDKs are now set up to use the Qt generated qt.toolchain.cmake,
which will chainload to previous Qt6Toolchain.cmake.
Change-Id: I3c04204377ba9ba0121df4fb2d1c162048518974
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>
(cherry picked from commit c69c2003869d426c10708b1e5ac9e09bc80c9c82)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | meta-boot2qt/files/qbsp/toolchain_installscript.qs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-boot2qt/files/qbsp/toolchain_installscript.qs b/meta-boot2qt/files/qbsp/toolchain_installscript.qs index f26de07b..a99040d6 100644 --- a/meta-boot2qt/files/qbsp/toolchain_installscript.qs +++ b/meta-boot2qt/files/qbsp/toolchain_installscript.qs @@ -134,7 +134,7 @@ Component.prototype.createOperations = function() "--icon", icon, "--cmake", cmakeId, "--cmake-generator", "Ninja", - "--cmake-config", "CMAKE_TOOLCHAIN_FILE:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/share/cmake/Qt6Toolchain.cmake", + "--cmake-config", "CMAKE_TOOLCHAIN_FILE:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/lib/cmake/Qt6/qt.toolchain.cmake", "--cmake-config", "CMAKE_MAKE_PROGRAM:FILEPATH=" + path + "/sysroots/" + hostSysroot + "/usr/bin/ninja" + executableExt]; if (systemInfo.kernelType === "winnt") { |