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

Prepend '_' to qt_internal_android_get_target_android_build_dir

Browse Source 
Adjust the function name according to our naming convention for
private function locating in public cmake scripts.

Pick-to: 6.8 6.5
Change-Id: I3a108cdb43bd4b3d8cf29ac4c42c7c20c541afc8
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 2adf9410607ec14a56fe1ac2eefa53bf4bb4e646)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2025-03-03 13:03:14 +01:00 committed by Qt Cherry-pick Bot
parent 2eff82ea39
commit 801482208c
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/QtPlatformAndroid.cmake
View File

@ -139,7 +139,7 @@ function(qt_internal_android_test_runner_arguments target out_test_runner out_te
set(${out_test_runner} "${QT_HOST_PATH}/${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BINDIR}/androidtestrunner" PARENT_SCOPE) set(${out_test_runner} "${QT_HOST_PATH}/${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BINDIR}/androidtestrunner" PARENT_SCOPE)
set(deployment_tool "${QT_HOST_PATH}/${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BINDIR}/androiddeployqt") set(deployment_tool "${QT_HOST_PATH}/${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BINDIR}/androiddeployqt")
qt_internal_android_get_target_android_build_dir(${target} android_build_dir) _qt_internal_android_get_target_android_build_dir(${target} android_build_dir)
set(${out_test_arguments} set(${out_test_arguments}
"--path" "${android_build_dir}" "--path" "${android_build_dir}"
"--adb" "${ANDROID_SDK_ROOT}/platform-tools/adb" "--adb" "${ANDROID_SDK_ROOT}/platform-tools/adb"

4
src/corelib/Qt6AndroidMacros.cmake
View File

@ -1713,7 +1713,7 @@ function(qt_internal_android_app_runner_arguments target out_runner_path out_arg
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)
qt_internal_android_get_target_android_build_dir(${target} android_build_dir) _qt_internal_android_get_target_android_build_dir(${target} android_build_dir)
set(${out_arguments} set(${out_arguments}
"--adb" "${ANDROID_SDK_ROOT}/platform-tools/adb" "--adb" "${ANDROID_SDK_ROOT}/platform-tools/adb"
"--build-path" "${android_build_dir}" "--build-path" "${android_build_dir}"
@ -1722,7 +1722,7 @@ function(qt_internal_android_app_runner_arguments target out_runner_path out_arg
) )
endfunction() endfunction()
function(qt_internal_android_get_target_android_build_dir target out_build_dir) function(_qt_internal_android_get_target_android_build_dir target out_build_dir)
get_target_property(target_binary_dir ${target} BINARY_DIR) get_target_property(target_binary_dir ${target} BINARY_DIR)
if(QT_USE_TARGET_ANDROID_BUILD_DIR) if(QT_USE_TARGET_ANDROID_BUILD_DIR)
set(${out_build_dir} "${target_binary_dir}/android-build-${target}" PARENT_SCOPE) set(${out_build_dir} "${target_binary_dir}/android-build-${target}" PARENT_SCOPE)