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

Android: fix documentation about ANDROID_EXTRA_LIBS

Browse Source 
ANDROID_ABIS should be used instead of ANDROID_TARGET_ARCH.

Fixes: QTBUG-81866
Pick-to: 5.15
Change-Id: I6dc9e0cd2a19bea8864e3ab4174bd609c0aad4dc
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
This commit is contained in:
Assam Boudjelthia 2020-11-02 14:59:13 +02:00
parent 231be2e0a1
commit 75d32a195a
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
qmake/doc/src/qmake-manual.qdoc
View File

@ -1001,6 +1001,19 @@
to enable OpenSSL in your application. For more information, see to enable OpenSSL in your application. For more information, see
\l{Adding OpenSSL Support for Android}. \l{Adding OpenSSL Support for Android}.
To include external libraries for multiple ABIs, where each ABIs has its own
directory, use the following:
\badcode
for (abi, ANDROID_ABIS): ANDROID_EXTRA_LIBS += $$PWD/$${abi}/library_name.so
\endcode
Otherwise, if the ABI is included in the library name, use the following:
\badcode
for (abi, ANDROID_ABIS): ANDROID_EXTRA_LIBS += $$PWD/library_name_$${abi}.so
\endcode
\target ANDROID_EXTRA_PLUGINS \target ANDROID_EXTRA_PLUGINS
\section1 ANDROID_EXTRA_PLUGINS \section1 ANDROID_EXTRA_PLUGINS
@ -1118,14 +1131,6 @@
Specifies the target Android API level for the project. By default, this Specifies the target Android API level for the project. By default, this
variable is set to API level 28. variable is set to API level 28.
\target ANDROID_TARGET_ARCH
\section1 ANDROID_TARGET_ARCH
\note This variable applies only to Android targets.
Specifies the Android target ABI. Valid values are: armeabi-v7a, arm64-v8a,
x86, x86_64.
\target ANDROID_VERSION_CODE \target ANDROID_VERSION_CODE
\section1 ANDROID_VERSION_CODE \section1 ANDROID_VERSION_CODE