From ad2143b8d26c57466258ea046e60d9a5c8fd70e3 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Wed, 27 Oct 2021 13:37:25 +0200 Subject: [PATCH] Add CMake variable to run androiddeployqt with --verbose argument Change-Id: Ib913e0471ef9c7efcc64c52de21a2e4c7d44e416 Reviewed-by: Alexandru Croitor Reviewed-by: Assam Boudjelthia Reviewed-by: Leena Miettinen --- src/corelib/Qt6AndroidMacros.cmake | 3 +++ src/corelib/doc/src/cmake/cmake-variables.qdoc | 17 +++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index 58a689fdce0..eb8552e641b 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -351,6 +351,9 @@ function(qt6_android_add_apk_target target) if(QT_INTERNAL_NO_ANDROID_RCC_BUNDLE_CLEANUP) list(APPEND extra_args "--no-rcc-bundle-cleanup") 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. if (CMAKE_GENERATOR MATCHES "Ninja" OR (CMAKE_VERSION VERSION_GREATER_EQUAL 3.20 AND CMAKE_GENERATOR MATCHES "Makefiles")) diff --git a/src/corelib/doc/src/cmake/cmake-variables.qdoc b/src/corelib/doc/src/cmake/cmake-variables.qdoc index af7a8b7acaf..1cef1ffd3c1 100644 --- a/src/corelib/doc/src/cmake/cmake-variables.qdoc +++ b/src/corelib/doc/src/cmake/cmake-variables.qdoc @@ -145,3 +145,20 @@ When finalizing an executable target on iOS, \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. */ + +/*! +\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. + +*/