From 744aac988b12c1a7e687fa3af2c0830cec7d3b1d Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 8 Feb 2023 19:24:15 +0100 Subject: [PATCH] Expose files locating in QT_ANDROID_PACKAGE_SOURCE_DIR to IDE "GLOB_RECURSE" files in the QT_ANDROID_PACKAGE_SOURCE_DIR directory if it's specified and expose them to IDE. Fixes: QTBUG-110810 Change-Id: I3c4d4fdf0dff8965fd277672ef9d77453839b4cb Reviewed-by: Alexandru Croitor (cherry picked from commit 478a5248f329172a9c371947ca4b24cfe60e8c82) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6AndroidMacros.cmake | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 48abb907a01..fb9bee952d6 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -1233,7 +1233,33 @@ endfunction() function(_qt_internal_android_executable_finalizer target) set_property(TARGET ${target} PROPERTY _qt_android_executable_finalizer_called TRUE) + _qt_internal_expose_android_package_source_dir_to_ide(${target}) + _qt_internal_configure_android_multiabi_target("${target}") qt6_android_generate_deployment_settings("${target}") qt6_android_add_apk_target("${target}") endfunction() + +function(_qt_internal_expose_android_package_source_dir_to_ide target) + get_target_property(android_package_source_dir ${target} QT_ANDROID_PACKAGE_SOURCE_DIR) + if(android_package_source_dir) + get_target_property(target_source_dir ${target} SOURCE_DIR) + if(NOT IS_ABSOLUTE "${android_package_source_dir}") + string(JOIN "/" android_package_source_dir + "${target_source_dir}" + "${android_package_source_dir}" + ) + endif() + + if(EXISTS "${android_package_source_dir}") + file(GLOB_RECURSE android_package_sources + RELATIVE "${target_source_dir}" + "${android_package_source_dir}/*" + ) + endif() + + foreach(f IN LISTS android_package_sources) + _qt_internal_expose_source_file_to_ide(${target} "${f}") + endforeach() + endif() +endfunction()