diff options
| author |   Alexey Edelev <alexey.edelev@qt.io> | 2022-09-19 11:08:49 +0200 |
|---|---|---|
| committer |   Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-09-26 13:43:17 +0000 |
| commit | 8b3c48920574f1ec82133feabfe7a6b8e28c357b (patch) | |
| tree | 975db46bcd540f93774efbc42357603d9786ae64 | |
| parent | Update url to IAccessible2 Specification (diff) | |
| download | qtbase-8b3c48920574f1ec82133feabfe7a6b8e28c357b.tar.xz qtbase-8b3c48920574f1ec82133feabfe7a6b8e28c357b.zip | |
Propagate QT_HOST_PATH_CMAKE_DIR to multi-ABI external projects
If QT_HOST_PATH_CMAKE_DIR is set it also needs to be used by multi-ABI
external projects. Add it to a list of cmake arguments.
Fixes: QTBUG-106616
Change-Id: I5b12f72cabdad86846851fb3605e5388896e5abf
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 79d3fba2eb271096b3d3da3b763b18f73a225201)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 4a98b1ab72..e8f4302c1a 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -961,6 +961,10 @@ function(_qt_internal_configure_android_multiabi_target target) list(APPEND extra_cmake_args "-DQT_NO_PACKAGE_VERSION_CHECK=${QT_NO_PACKAGE_VERSION_CHECK}") endif() + if(DEFINED QT_HOST_PATH_CMAKE_DIR) + list(APPEND extra_cmake_args "-DQT_HOST_PATH_CMAKE_DIR=${QT_HOST_PATH_CMAKE_DIR}") + endif() + if(CMAKE_MAKE_PROGRAM) list(APPEND extra_cmake_args "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}") endif() |