diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-02 14:59:13 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-11-02 15:08:35 +0200 |
| commit | 75d32a195a1dbba42756353ee1705b709bfab002 (patch) | |
| tree | 0082751b9bd7cb80a00eaec983d9a7417886bb84 /qmake | |
| parent | 231be2e0a192f16141c12888e126bb2284b29b9f (diff) | |
Android: fix documentation about ANDROID_EXTRA_LIBS
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>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 576beac1c4..0889079e30 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1001,6 +1001,19 @@ to enable OpenSSL in your application. For more information, see \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 \section1 ANDROID_EXTRA_PLUGINS @@ -1118,14 +1131,6 @@ Specifies the target Android API level for the project. By default, this 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 \section1 ANDROID_VERSION_CODE |