diff options
| author | Alexey Edelev <[email protected]> | 2025-03-03 13:03:14 +0100 |
|---|---|---|
| committer | Alexey Edelev <[email protected]> | 2025-03-26 01:14:32 +0100 |
| commit | 2adf9410607ec14a56fe1ac2eefa53bf4bb4e646 (patch) | |
| tree | f89360a1118e16191ed3d0770343ac6b1ecc7885 | |
| parent | f10f609db9488629a1abf8c363f32dbd3abdf456 (diff) | |
Prepend '_' to qt_internal_android_get_target_android_build_dir
Adjust the function name according to our naming convention for
private function locating in public cmake scripts.
Pick-to: 6.5 6.8 6.9
Change-Id: I3a108cdb43bd4b3d8cf29ac4c42c7c20c541afc8
Reviewed-by: Assam Boudjelthia <[email protected]>
Reviewed-by: Alexandru Croitor <[email protected]>
| -rw-r--r-- | cmake/QtPlatformAndroid.cmake | 2 | ||||
| -rw-r--r-- | src/corelib/Qt6AndroidMacros.cmake | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index 62f0b93c75c..f055f32cf7f 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -141,7 +141,7 @@ function(qt_internal_android_test_runner_arguments target out_test_runner out_te set(${out_test_runner} "${host_bin_dir}/androidtestrunner" PARENT_SCOPE) set(deployment_tool "${host_bin_dir}/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} "--path" "${android_build_dir}" "--adb" "${ANDROID_SDK_ROOT}/platform-tools/adb" diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 1c06cd917d5..4fb468cd9c0 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -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(${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} "--adb" "${ANDROID_SDK_ROOT}/platform-tools/adb" "--build-path" "${android_build_dir}" @@ -1722,7 +1722,7 @@ function(qt_internal_android_app_runner_arguments target out_runner_path out_arg ) 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) if(QT_USE_TARGET_ANDROID_BUILD_DIR) set(${out_build_dir} "${target_binary_dir}/android-build-${target}" PARENT_SCOPE) |