AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add CMake variable to run androiddeployqt with --verbose argument

Browse Source 
Change-Id: Ib913e0471ef9c7efcc64c52de21a2e4c7d44e416
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Alexey Edelev 2021-10-27 13:37:25 +02:00
parent df2aa08187
commit ad2143b8d2
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/corelib/Qt6AndroidMacros.cmake
View File

@ -351,6 +351,9 @@ function(qt6_android_add_apk_target target)
if(QT_INTERNAL_NO_ANDROID_RCC_BUNDLE_CLEANUP) if(QT_INTERNAL_NO_ANDROID_RCC_BUNDLE_CLEANUP)
list(APPEND extra_args "--no-rcc-bundle-cleanup") list(APPEND extra_args "--no-rcc-bundle-cleanup")
endif() endif()
if(QT_ENABLE_VERBOSE_DEPLOYMENT)
list(APPEND extra_args "--verbose")
endif()
# The DEPFILE argument to add_custom_command is only available with Ninja or CMake>=3.20 and make. # The DEPFILE argument to add_custom_command is only available with Ninja or CMake>=3.20 and make.
if (CMAKE_GENERATOR MATCHES "Ninja" OR if (CMAKE_GENERATOR MATCHES "Ninja" OR
(CMAKE_VERSION VERSION_GREATER_EQUAL 3.20 AND CMAKE_GENERATOR MATCHES "Makefiles")) (CMAKE_VERSION VERSION_GREATER_EQUAL 3.20 AND CMAKE_GENERATOR MATCHES "Makefiles"))

17
src/corelib/doc/src/cmake/cmake-variables.qdoc
View File

@ -145,3 +145,20 @@ When finalizing an executable target on iOS,
\c MACOSX_BUNDLE_GUI_IDENTIFIER properties if they haven't been set. \c MACOSX_BUNDLE_GUI_IDENTIFIER properties if they haven't been set.
Set \c QT_NO_SET_XCODE_BUNDLE_IDENTIFIER to true if you want to prevent this. Set \c QT_NO_SET_XCODE_BUNDLE_IDENTIFIER to true if you want to prevent this.
*/ */
/*!
\page cmake-variable-QT_ENABLE_VERBOSE_DEPLOYMENT.html
\ingroup cmake-variables
\ingroup cmake-variables-qtcore
\title QT_ENABLE_VERBOSE_DEPLOYMENT
\target cmake-variable-QT_ENABLE_VERBOSE_DEPLOYMENT
\summary {Enables verbose mode of deployment tools}
\preliminarycmakevariable
Enables verbose mode of the androiddeployqt deployment tool when it is implicitly called
inside the Qt CMake commands.
*/