summaryrefslogtreecommitdiffstats
path: root/src/corelib/Qt6AndroidMacros.cmake
diff options
context:
space:
mode:
authorAlexey Edelev <alexey.edelev@qt.io>2021-11-05 15:02:42 +0100
committerAlexey Edelev <alexey.edelev@qt.io>2021-11-05 23:40:25 +0100
commita07598e47ba4359accd6d0a8060d37f1e03db550 (patch)
tree98e619850db9c11a250c06e17b2a46b8f461164e /src/corelib/Qt6AndroidMacros.cmake
parent081a2b9b1f633fc54f6288a0ea5974a545035327 (diff)
Move the ${target}_prepare_apk_dir target description
Move the description of ${target}_prepare_apk_dir to the right place. The code related to qt_internal_plugins was mistakenly placed between comment and target creation, so move it to avoid confusion. Change-Id: Iaf178811a30ce0f51d6131c8a68f024d3efddfeb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/Qt6AndroidMacros.cmake')
-rw-r--r--src/corelib/Qt6AndroidMacros.cmake9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake
index 9ccdde0be0..655647c6d9 100644
--- a/src/corelib/Qt6AndroidMacros.cmake
+++ b/src/corelib/Qt6AndroidMacros.cmake
@@ -335,11 +335,6 @@ function(qt6_android_add_apk_target target)
set(copy_target_path "${QT_ANDROID_ABI_TARGET_PATH}")
endif()
- # This target is used by Qt Creator's Android support and by the ${target}_make_apk target
- # in case DEPFILEs are not supported.
- # Also the target is used to copy the library that belongs to ${target} when building multi-abi
- # apk to the abi-specific directory.
-
set(extra_deps "")
# Plugins still might be added after creating the deployment targets.
@@ -349,6 +344,10 @@ function(qt6_android_add_apk_target target)
# Before running androiddeployqt, we need to make sure all plugins are built.
list(APPEND extra_deps qt_internal_plugins)
+ # This target is used by Qt Creator's Android support and by the ${target}_make_apk target
+ # in case DEPFILEs are not supported.
+ # Also the target is used to copy the library that belongs to ${target} when building multi-abi
+ # apk to the abi-specific directory.
add_custom_target(${target}_prepare_apk_dir ALL
DEPENDS ${target} ${extra_deps}
COMMAND ${CMAKE_COMMAND}