diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-27 03:03:22 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-27 03:03:22 +0200 |
| commit | 13cb34649de68454444d90d0754bc7bd2b6d0359 (patch) | |
| tree | 688df21f8db52dae9d05f8ce2d3c08240bae4037 | |
| parent | e784b193f8892c169890cc4783cfcc5c61243dda (diff) | |
| parent | 4ef5512d625f2ee5198f08645482bd42d90e47f2 (diff) | |
| download | qtdoc-13cb34649de68454444d90d0754bc7bd2b6d0359.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ic5e2e2abd3a326a7a4b83886d47b2a0f4193cebe
| -rw-r--r-- | doc/src/platforms/android.qdoc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc index c7df6379..78136e5f 100644 --- a/doc/src/platforms/android.qdoc +++ b/doc/src/platforms/android.qdoc @@ -341,8 +341,13 @@ the APK: See the \l{OpenSSL Configure Options}{SSL configure options} for details about the configurable features. - \li Run \c{make CALC_VERSIONS="SHLIB_COMPAT=; SHLIB_SOVER=" build_libs} to - build the \c libcrypto and \c libssl shared libraries that are not versioned. + \li Run \c{make SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so build_libs} to + build \c libcrypto and \c libssl shared libraries that are not versioned, + but with a \e _1_1 suffix. If you want to use a different suffix, then you must + set the \c ANDROID_OPENSSL_SUFFIX environment variable before you access the + Qt Network API. Without a suffix, Android 5 (API 21) will load the system + libraries \e libcrypto.so and \e libssl.so, which are OpenSSL 1.0, rather than + your libraries. \note Android does not load versioned libraries. |