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

Add the list of supported Android ABIs to the related documentation

Browse Source 
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>
This commit is contained in:
Alexey Edelev 2022-01-26 14:11:31 +01:00
parent b94e204861
commit 7faf776096
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/corelib/doc/src/cmake/cmake-configure-variables.qdoc
View File

@ -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 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 build a package. The automatic detection expects the default directory structure
supplied by the Qt installer, with the corresponding naming of the directories. 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: The typical directory structure looks as below:
\badcode \badcode
/path/to/Qt/6.x.x /path/to/Qt/6.x.x
@ -152,13 +153,13 @@ The variable is set to FALSE by default.
\preliminarycmakevariable \preliminarycmakevariable
\cmakevariableandroidonly \cmakevariableandroidonly
This variable specifies a list of ABIs to be used to build the project packages. The This variable specifies a list of ABIs to be used to build the project packages.
supported ABIs: \c{armeabi-v7a, arm64-v8a, x86, x86_64}. Each ABI should have the \include cmake-android-supported-abis.qdocinc
corresponding Qt for Android either installed or user-built. It's possible to Each ABI should have the corresponding Qt for Android either installed or
specify the path to the Qt for Android ABI using the corresponding user-built. It's possible to specify the path to the Qt for Android ABI using
\c{QT_PATH_ANDROID_ABI_<ABI>} variable. 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. QT_ANDROID_ABIS logic.
\sa{QT_PATH_ANDROID_ABI_<ABI>}, {QT_ANDROID_BUILD_ALL_ABIS} \sa{QT_PATH_ANDROID_ABI_<ABI>}, {QT_ANDROID_BUILD_ALL_ABIS}
@ -179,7 +180,7 @@ QT_ANDROID_ABIS logic.
\cmakevariableandroidonly \cmakevariableandroidonly
Each variable can be used to specify the path to Qt for Android for the corresponding ABI. 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} \sa{cmake-variable-QT_ANDROID_ABIS}{QT_ANDROID_ABIS}
*/ */

1
src/corelib/doc/src/cmake/cmake-properties.qdoc
View File

@ -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 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. 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} \sa{cmake-variable-QT_ANDROID_ABIS}{QT_ANDROID_ABIS}, {QT_ANDROID_BUILD_ALL_ABIS}
*/ */

1
src/corelib/doc/src/includes/cmake-android-supported-abis.qdocinc Normal file
View File

@ -0,0 +1 @@
The supported ABIs are \c{armeabi-v7a, arm64-v8a, x86, x86_64}.