From fbcf910831ef7ba4897d7e818dc0c1c3e45e28a6 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Thu, 25 Aug 2022 14:36:08 +0200 Subject: [PATCH] CMake: Add documentation for QT_NO_COLLECT_BUILD_TREE_APK_DEPS Amends 63f79d7ffb22de89a2c6314caa5b5a1908590063 Pick-to: 6.3 6.4 Change-Id: I0d2fb6377653d88f4899b990d9c073df86047b61 Reviewed-by: Assam Boudjelthia --- .../src/cmake/cmake-configure-variables.qdoc | 22 +++++++++++++++++++ .../doc/src/cmake/qt_finalize_project.qdoc | 1 + 2 files changed, 23 insertions(+) diff --git a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc index 32f65a8722..ffcddffc37 100644 --- a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc +++ b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc @@ -205,6 +205,28 @@ Mentioned variables are used internally by \l{androiddeployqt}. \sa{androiddeployqt} */ +/*! +\page cmake-variable-QT_NO_COLLECT_BUILD_TREE_APK_DEPS.html +\ingroup cmake-variables-qtcore + +\title QT_NO_COLLECT_BUILD_TREE_APK_DEPS +\target cmake-variable-QT_NO_COLLECT_BUILD_TREE_APK_DEPS + +\summary {Prevents collecting of project-built shared library targets during Android deployment.} + +\cmakevariablesince 6.3 +\preliminarycmakevariable +\cmakevariableandroidonly + +During project finalization, the build system collects the locations of +all built shared library targets in the project. +These locations are passed to \l androiddeployqt for deployment consideration when +resolving dependencies between libraries. +Set \c QT_NO_COLLECT_BUILD_TREE_APK_DEPS to \c TRUE to disable this behavior. + +\sa {qt6_finalize_project}{qt_finalize_project()} +*/ + /*! \page cmake-variable-QT_HOST_PATH.html \ingroup cmake-variables-qtcore diff --git a/src/corelib/doc/src/cmake/qt_finalize_project.qdoc b/src/corelib/doc/src/cmake/qt_finalize_project.qdoc index 54eb55528b..62af36c917 100644 --- a/src/corelib/doc/src/cmake/qt_finalize_project.qdoc +++ b/src/corelib/doc/src/cmake/qt_finalize_project.qdoc @@ -44,4 +44,5 @@ function: \snippet cmake-macros/examples.cmake qt_finalize_project_manual +\sa {cmake-variable-QT_NO_COLLECT_BUILD_TREE_APK_DEPS}{QT_NO_COLLECT_BUILD_TREE_APK_DEPS} */