summaryrefslogtreecommitdiffstats
path: root/src/corelib/Qt6AndroidMacros.cmake
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-12-14 17:13:41 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-12-15 15:13:04 +0000
commite06df5d17a4bb0150fffd327449b7a278114b3fa (patch)
treed946538d70fded40cc3e3076710349d213dae88c /src/corelib/Qt6AndroidMacros.cmake
parent699e661b2be8fbd8b0ba65aa3356bf0585f760e1 (diff)
Fix the copy path of the binary when building for Android in QtCreator
The target path of copy command should include 'libs/${CMAKE_ANDROID_ARCH_ABI}' to make the apk build procedure work correctly in QtCreator. Amends 87db26bdfe56e9445c03623eb962f569b2570b92 Change-Id: Icaffc3d7418a9a4994f86e453b329a69452c5f0b Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> (cherry picked from commit f51d6779481cffeb0b4a426148953194d57ef06b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/Qt6AndroidMacros.cmake')
-rw-r--r--src/corelib/Qt6AndroidMacros.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake
index d2661022c2..3db5ce2132 100644
--- a/src/corelib/Qt6AndroidMacros.cmake
+++ b/src/corelib/Qt6AndroidMacros.cmake
@@ -357,7 +357,7 @@ function(qt6_android_add_apk_target target)
DEPENDS ${target} ${extra_deps}
COMMAND ${CMAKE_COMMAND}
-E copy_if_different $<TARGET_FILE:${target}>
- "${apk_final_dir}/$<TARGET_FILE_NAME:${target}>"
+ "${apk_final_dir}/${target_file_copy_relative_path}"
COMMENT "Copying ${target} binary to apk folder"
)