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

Move the ${target}_prepare_apk_dir target description

Browse Source 
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>
This commit is contained in:
Alexey Edelev 2021-11-05 15:02:42 +01:00
parent 081a2b9b1f
commit a07598e47b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/corelib/Qt6AndroidMacros.cmake
View File

@ -335,11 +335,6 @@ function(qt6_android_add_apk_target target)
set(copy_target_path "${QT_ANDROID_ABI_TARGET_PATH}") set(copy_target_path "${QT_ANDROID_ABI_TARGET_PATH}")
endif() 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 "") set(extra_deps "")
# Plugins still might be added after creating the deployment targets. # 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. # Before running androiddeployqt, we need to make sure all plugins are built.
list(APPEND extra_deps qt_internal_plugins) 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 add_custom_target(${target}_prepare_apk_dir ALL
DEPENDS ${target} ${extra_deps} DEPENDS ${target} ${extra_deps}
COMMAND ${CMAKE_COMMAND} COMMAND ${CMAKE_COMMAND}