From 9775c63340ffe030400510c450464378b15b50f7 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 19 Sep 2022 11:08:49 +0200 Subject: [PATCH] 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 (cherry picked from commit 79d3fba2eb271096b3d3da3b763b18f73a225201) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6AndroidMacros.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index bff38abf70d..8e1543752eb 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -971,6 +971,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()