summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2020-04-17 13:05:48 +0300
committerAssam Boudjelthia <assam.boudjelthia@qt.io>2020-04-28 08:30:10 +0000
commit52e67b5b4f42f821d411510c3b9675a23c9f5518 (patch)
treecbb093d9f50c0fe70fd6025b91d8dd3b862a61f7
parente9df750872ef3c08c7f5e2a1a15a643d6913f978 (diff)
downloadqtdoc-52e67b5b4f42f821d411510c3b9675a23c9f5518.tar.gz
Android: add sdk and ndk environment variables to deployment docs
Task-number: QTBUG-80390 Change-Id: I595fdd2047dad92dd8bd52be2eea0525cd0692c4 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
-rw-r--r--doc/src/platforms/android/android-deploying-application.qdoc23
1 files changed, 18 insertions, 5 deletions
diff --git a/doc/src/platforms/android/android-deploying-application.qdoc b/doc/src/platforms/android/android-deploying-application.qdoc
index b3128acf..796dcab0 100644
--- a/doc/src/platforms/android/android-deploying-application.qdoc
+++ b/doc/src/platforms/android/android-deploying-application.qdoc
@@ -432,7 +432,21 @@
it should be possible to run \l androiddeployqt on it with no modifications
and get a working Qt for Android application.
- However, there are a set of \c qmake variables that can be used to tailor
+ There are two important environment variables used by Qt:
+
+ \list
+ \li \c{ANDROID_SDK_ROOT}: specifies the path to the Android SDK used for
+ building the application. The Android SDK contains the build-tools,
+ Android NDK, and Android toolchains.
+ \li \c{ANDROID_NDK_ROOT}: specifies the path to the Android NDK used to
+ build the application. It is not recommended to hard-code this path,
+ since different Qt for Android versions can depend on different
+ Android NDK versions.
+ \endlist
+
+ \note Qt Creator sets these variables by default.
+
+ There are a set of \c qmake variables that can be used to tailor
your package. At some point during development, you will most likely want
to look into these variables to customize your application.
@@ -448,14 +462,13 @@
\li \l{ANDROID_ABIS}
\li \l{ANDROID_API_VERSION}
\li \l{ANDROID_DEPLOYMENT_DEPENDENCIES}
- \li \l{ANDROID_SDK_ROOT}
- \li \l{ANDROID_NDK_ROOT}
\li \l{ANDROID_MIN_SDK_VERSION}
\li \l{ANDROID_TARGET_SDK_VERSION}
\li \l{JAVA_HOME}
\endlist
- Also, the most useful \c qmake variable when writing a Qt module:
+ Also, the following \c qmake variables are primarily useful when writing a Qt module, and not
+ normal applications:
\list
\li \l{ANDROID_BUNDLED_JAR_DEPENDENCIES}
@@ -470,5 +483,5 @@
Qt Creator runs the \l androiddeployqt tool by default, and provides easy
and intuitive user interfaces to specify many of the options. For more
- information, see \l{Qt Creator: Deploying Applications to Android Devices}{the Qt Creator documentation}.
+ information, see \l{Qt Creator: Deploying Applications to Android Devices}.
*/