diff options
| author | Alexey Edelev <alexey.edelev@qt.io> | 2023-05-24 19:13:49 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-05-31 10:57:29 +0000 |
| commit | 193cf15847f084e1e3d75feb1dcf31ed416b28a6 (patch) | |
| tree | 59a821bd244f5b4ca9c5a32cef97cecb5e78d6c9 | |
| parent | 281174f5e010d819a49562b48b2c2067255a41c6 (diff) | |
Compute the path to the Qt host toolchain using QT_HOST_PATH_CMAKE_DIR
QT_HOST_PATH_CMAKE_DIR might differ from '${QT_HOST_PATH}/lib/cmake'
if users prefer the custom installation layout. WebEngine should
use QT_HOST_PATH_CMAKE_DIR directly when looking for the
qt.toolchain.cmake file.
Fixes: QTBUG-113802
Change-Id: I24087fc1a2f220092b43a32bd00d4e4827a1d879
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit d50c5f3b6c154cd25657582a51d2c8a5dc52b90d)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a62252783..59eb27e73 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -169,7 +169,7 @@ if(CMAKE_CROSSCOMPILING AND NOT IOS AND NOT MACOS) PREFIX host USES_TERMINAL_BUILD TRUE EXCLUDE_FROM_ALL TRUE - CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${QT_HOST_PATH}/lib/cmake/Qt6/qt.toolchain.cmake + CMAKE_ARGS -DCMAKE_TOOLCHAIN_FILE=${QT_HOST_PATH_CMAKE_DIR}/Qt6/qt.toolchain.cmake -DWEBENGINE_ROOT_BUILD_DIR=${PROJECT_BINARY_DIR} -DWEBENGINE_ROOT_SOURCE_DIR=${WEBENGINE_ROOT_SOURCE_DIR} -DGN_TARGET_CPU=${TEST_architecture_arch} |