From 704f95e9b94ff76aaf37323e2df5e210d1a37abe Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 18 Nov 2020 14:39:18 +0200 Subject: [PATCH] CMake: add CMAKE_FIND_ROOT_PATH as extraPrefixDirs for androiddeployqt androiddeployqt has extraPrefixDirs to provide extra prefix paths in addition to the main Qt install path, however, for some reason, it was not being used. With this, apps for Android using Conan can pass the Conan build prefix for androiddeployqt to use it as well. Task-number: QTBUG-88519 Change-Id: Iad73055ac6c03e3ffe86fca271dbda67ac29a275 Reviewed-by: Iikka Eklund Reviewed-by: Alexandru Croitor (cherry picked from commit 00e726ce12431e8c3db8bc9deb8952f930a5a672) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6AndroidMacros.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 6e03ecc55dc..aa95eb99b28 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -198,6 +198,17 @@ endif() string(APPEND file_contents " \"rcc-binary\" : \"${rcc_binary_path_native}\",\n") + # Extra prefix paths + foreach(prefix IN LISTS CMAKE_FIND_ROOT_PATH) + if (NOT "${prefix}" STREQUAL "${qt_android_install_dir_native}" + AND NOT "${prefix}" STREQUAL "${android_ndk_root_native}") + list(APPEND extra_prefix_list \"${prefix}\") + endif() + endforeach() + string (REPLACE ";" "," extra_prefix_list "${extra_prefix_list}") + string(APPEND file_contents + " \"extraPrefixDirs\" : [ ${extra_prefix_list} ],\n") + # Last item in json file # base location of stdlibc++, will be suffixed by androiddeploy qt