summaryrefslogtreecommitdiff
path: root/doc/src/platforms
diff options
context:
space:
mode:
authorJason Erb <erb@suitabletech.com>2017-03-15 22:41:41 -0400
committerJason Erb (Suitable Technologies) <erb@suitabletech.com>2017-03-20 15:16:14 +0000
commit2337a01600ec81a70c8711a7c37a8e55bc14d121 (patch)
treed62ea0d81e51962d262706552cf61177e2f678a9 /doc/src/platforms
parentbd33a4280cb15c3910e4727452eeeaf54f4c75bf (diff)
downloadqtdoc-5.8.tar.gz
Improve “Adding OpenSSL Support” page5.8
Indicate in the title that the page pertains to Android, and add RANLIB to the environment variables that should be set. Task-number: QTBUG-59525 Change-Id: Ibb6a4694d83db159d2ff5da51f92e195274c7163 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
Diffstat (limited to 'doc/src/platforms')
-rw-r--r--doc/src/platforms/android.qdoc5
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index bd03b987..06d8f53a 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -62,7 +62,7 @@ The following topics provide more details about how to use Qt for Android:
\list
\li \l{Getting Started with Qt for Android}{Getting Started}
\li \l{Porting to Android}{Porting a Qt Application}
- \li \l{Adding OpenSSL Support}
+ \li \l{Adding OpenSSL Support for Android}
\li \l{Android Services}{Creating Android Services}
\li \l{Third-party Android Libraries}{Including third-party Android libraries in an application}
\li \l{Qt Creator: Deploying Applications to Android Devices}{Deploying to the Device}
@@ -275,7 +275,7 @@ AVDs found.
/*!
\page opensslsupport.html
-\title Adding OpenSSL Support
+\title Adding OpenSSL Support for Android
\brief Provides instructions to package OpenSSL libraries with your Qt application for Android.
The Qt installation package comes with OpenSSL support but the OpenSSL libraries
@@ -301,6 +301,7 @@ the APK:
\badcode
CC=<ANDROID_NDK_PATH>/toolchains/arm-linux-androideabi-<VER>/prebuilt/<NDK_HOST>/bin/arm-linux-androideabi-gcc
AR=<ANDROID_NDK_PATH>/toolchains/arm-linux-androideabi-<VER>/prebuilt/<NDK_HOST>/bin/arm-linux-androideabi-ar
+ RANLIB=<ANDROID_NDK_PATH>/toolchains/arm-linux-androideabi-<VER>/prebuilt/<NDK_HOST>/bin/arm-linux-androideabi-ranlib
ANDROID_DEV=<ANDROID_NDK_PATH>/platforms/<ANDROID-PLATFORM>/arch-arm/usr
\endcode