From 91fc9fe7961b16eeebe379a7e2ba90dca1527b53 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 3 Mar 2025 13:05:09 +0100 Subject: [PATCH] Change _qt_internal_android_get_target_android_build_dir signature Swap the argument order so the "output" is the first argument. Pick-to: 6.8 6.5 Change-Id: I1325af97f1d6540c6897b51f1b5736b4534f6412 Reviewed-by: Alexandru Croitor Reviewed-by: Assam Boudjelthia (cherry picked from commit b434e0be797f8e347d58077b8ef21086d7a7d055) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtPlatformAndroid.cmake | 2 +- src/corelib/Qt6AndroidMacros.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index 42666438b57..48929173c2c 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -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(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(android_build_dir ${target}) 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 4fb468cd9c0..e61175b3cbb 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(android_build_dir ${target}) 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 out_build_dir target) 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)