1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Name (_)qt_internal_android_app_runner_arguments properly

Browse Source 
The function is located in public CMake commands and should be '_'
prefixed.

Amends a905d26f14da1cf86b8490331c0cc41c2a45b283

Pick-to: 6.8
Change-Id: I2817105de4e60d9e5d9a65479af2d11ac6406dae
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit be5845e8ca8d4a8d5b9606295b672b591c660a01)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2025-03-25 15:52:40 +01:00 committed by Qt Cherry-pick Bot
parent 00ef067a2d
commit 9bde2afb5c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/Qt6AndroidMacros.cmake
View File

@ -1692,7 +1692,7 @@ function(_qt_internal_android_create_runner_wrapper target)
if(is_test AND NOT is_manual_test) if(is_test AND NOT is_manual_test)
qt_internal_android_test_runner_arguments("${target}" tool_path arguments) qt_internal_android_test_runner_arguments("${target}" tool_path arguments)
else() else()
qt_internal_android_app_runner_arguments("${target}" tool_path arguments) _qt_internal_android_app_runner_arguments("${target}" tool_path arguments)
endif() endif()
set(args_splitter "") set(args_splitter "")
@ -1736,7 +1736,7 @@ function(_qt_internal_android_create_runner_wrapper target)
endfunction() endfunction()
# Get the android runner script path and its arguments for a target # Get the android runner script path and its arguments for a target
function(qt_internal_android_app_runner_arguments target out_runner_path out_arguments) function(_qt_internal_android_app_runner_arguments target out_runner_path out_arguments)
set(runner_dir "${QT_HOST_PATH}/${QT6_HOST_INFO_LIBEXECDIR}") set(runner_dir "${QT_HOST_PATH}/${QT6_HOST_INFO_LIBEXECDIR}")
set(${out_runner_path} "${runner_dir}/qt-android-runner.py" PARENT_SCOPE) set(${out_runner_path} "${runner_dir}/qt-android-runner.py" PARENT_SCOPE)