diff options
author | Alexey Edelev <alexey.edelev@qt.io> | 2022-01-26 14:11:31 +0100 |
---|---|---|
committer | Alexey Edelev <alexey.edelev@qt.io> | 2022-02-02 15:16:01 +0100 |
commit | 7faf77609616e367cd9e4acf69ae46d8ec690533 (patch) | |
tree | cae957acb09e23c462ad711e4b34948988f82b9d /src/corelib/doc/src | |
parent | b94e2048610f8ea9dba81ddc2dcf912b33c4d20d (diff) |
Add the list of supported Android ABIs to the related documentation
Task-number: QTBUG-100208
Pick-to: 6.3
Change-Id: I147d8a6b31164f7d9578c205af729643ec066134
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/doc/src')
3 files changed, 10 insertions, 7 deletions
diff --git a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc index bb329aa7aa..f58ee9a1db 100644 --- a/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc +++ b/src/corelib/doc/src/cmake/cmake-configure-variables.qdoc @@ -122,6 +122,7 @@ out as part of the deployment settings for a target. The option automatically detects available ABIs of Qt for Android and uses them to build a package. The automatic detection expects the default directory structure supplied by the Qt installer, with the corresponding naming of the directories. +\include cmake-android-supported-abis.qdocinc The typical directory structure looks as below: \badcode /path/to/Qt/6.x.x @@ -152,13 +153,13 @@ The variable is set to FALSE by default. \preliminarycmakevariable \cmakevariableandroidonly -This variable specifies a list of ABIs to be used to build the project packages. The -supported ABIs: \c{armeabi-v7a, arm64-v8a, x86, x86_64}. Each ABI should have the -corresponding Qt for Android either installed or user-built. It's possible to -specify the path to the Qt for Android ABI using the corresponding -\c{QT_PATH_ANDROID_ABI_<ABI>} variable. +This variable specifies a list of ABIs to be used to build the project packages. +\include cmake-android-supported-abis.qdocinc +Each ABI should have the corresponding Qt for Android either installed or +user-built. It's possible to specify the path to the Qt for Android ABI using +the corresponding \c{QT_PATH_ANDROID_ABI_<ABI>} variable. -\note: \c{QT_ANDROID_BUILD_ALL_ABIS} has the higher priority and ignores the +\note \c{QT_ANDROID_BUILD_ALL_ABIS} has the higher priority and ignores the QT_ANDROID_ABIS logic. \sa{QT_PATH_ANDROID_ABI_<ABI>}, {QT_ANDROID_BUILD_ALL_ABIS} @@ -179,7 +180,7 @@ QT_ANDROID_ABIS logic. \cmakevariableandroidonly Each variable can be used to specify the path to Qt for Android for the corresponding ABI. -The list of supported ABIs can be found in the \c{QT_ANDROID_ABIS} variable documentation. +\include cmake-android-supported-abis.qdocinc \sa{cmake-variable-QT_ANDROID_ABIS}{QT_ANDROID_ABIS} */ diff --git a/src/corelib/doc/src/cmake/cmake-properties.qdoc b/src/corelib/doc/src/cmake/cmake-properties.qdoc index e05d94649e..9e62da8f30 100644 --- a/src/corelib/doc/src/cmake/cmake-properties.qdoc +++ b/src/corelib/doc/src/cmake/cmake-properties.qdoc @@ -250,6 +250,7 @@ For more information, see \l{Android: App Versioning}{Android App Versioning}. By setting the \c{QT_ANDROID_ABIS} property for a target, it's possible to control the list of ABIs that the single target packages are supposed to be built for. +\include cmake-android-supported-abis.qdocinc \sa{cmake-variable-QT_ANDROID_ABIS}{QT_ANDROID_ABIS}, {QT_ANDROID_BUILD_ALL_ABIS} */ diff --git a/src/corelib/doc/src/includes/cmake-android-supported-abis.qdocinc b/src/corelib/doc/src/includes/cmake-android-supported-abis.qdocinc new file mode 100644 index 0000000000..887866739c --- /dev/null +++ b/src/corelib/doc/src/includes/cmake-android-supported-abis.qdocinc @@ -0,0 +1 @@ +The supported ABIs are \c{armeabi-v7a, arm64-v8a, x86, x86_64}. |