summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetri Virkkunen <petri.virkkunen@qt.io>2022-07-25 14:36:08 +0300
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-07-26 09:25:06 +0000
commitb46ebc0c99d3259407c7d0bddd476bd2db1b29c8 (patch)
tree3661410cbad3b1c7e4dfbfef39bdebc9a550598b
parentb4ab9b54348dbf71a8f1f911d87a91a99f52c0ee (diff)
downloadqtdoc-b46ebc0c99d3259407c7d0bddd476bd2db1b29c8.tar.gz
Update Android OpenSSL documentation to use new CMake variable for OpenSSL libs
Use QT_ANDROID_EXTRA_LIBS variable instead of ANDROID_EXTRA_LIBS. Change-Id: I960d463908d84962bbe5f21f4e8124691fa2a796 Reviewed-by: Tatiana Borisova <tatiana.borisova@qt.io> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Soheil Armin <soheil.armin@qt.io> Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 5bccbe2f4425498bb289f4f613f6dff0577cf6e3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--doc/src/platforms/android/android-openssl-support.qdoc11
1 files changed, 5 insertions, 6 deletions
diff --git a/doc/src/platforms/android/android-openssl-support.qdoc b/doc/src/platforms/android/android-openssl-support.qdoc
index 252b3d6a..e337cc14 100644
--- a/doc/src/platforms/android/android-openssl-support.qdoc
+++ b/doc/src/platforms/android/android-openssl-support.qdoc
@@ -141,8 +141,8 @@ the following step to include those libraries in your project:
endif()
\endcode
- Alternatively, you can either use the Qt for Android variable ANDROID_EXTRA_LIBS to add
- extra libraries, mainly \c libcrypto and \c libssl. For QMake use:
+ Alternatively, you can use the following project variable to add extra
+ libraries, such as \c libcrypto and \c libssl. For QMake use:
\badcode
ANDROID_EXTRA_LIBS += \
@@ -153,10 +153,9 @@ the following step to include those libraries in your project:
For CMake:
\badcode
- set(ANDROID_EXTRA_LIBS
- <path_to_libs_dir>/ibcrypto_1_1.so
- <path_to_libs_dir>/libssl_1_1.so
- CACHE INTERNAL "")
+ set_property(TARGET <target name> PROPERTY QT_ANDROID_EXTRA_LIBS
+ <path_to_libs_dir>/libcrypto_1_1.so
+ <path_to_libs_dir>/libssl_1_1.so)
\endcode
\note When targeting multiple architectures, include OpenSSL libraries