aboutsummaryrefslogtreecommitdiffstats
path: root/doc/reference/modules/android-sdk-module.qdoc
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@theqtcompany.com>2015-01-13 18:14:42 +0100
committerChristian Kandeler <christian.kandeler@theqtcompany.com>2015-01-13 18:25:46 +0100
commit42984ac3b348a7cc33eac44c6fefb3d5259a6780 (patch)
treedbc179c8755e76e491109e9134a8813b03ea4bc7 /doc/reference/modules/android-sdk-module.qdoc
parentdb78c99fa51f65f72e578f9f7b75489cdfa94ce5 (diff)
Add autotest for Android.
Covers SDK and NDK functionality. Change-Id: I5f252ba43918a2440848b6f7d027c9082946ff1e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'doc/reference/modules/android-sdk-module.qdoc')
-rw-r--r--doc/reference/modules/android-sdk-module.qdoc7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/reference/modules/android-sdk-module.qdoc b/doc/reference/modules/android-sdk-module.qdoc
index b145bdb1b..3a5c1e237 100644
--- a/doc/reference/modules/android-sdk-module.qdoc
+++ b/doc/reference/modules/android-sdk-module.qdoc
@@ -60,6 +60,11 @@
\li The version of the build tools such as aapt and dx. The \c setup-android
tool sets this to the highest version available in the SDK.
\row
+ \li ndkDir
+ \li string
+ \li undefined
+ \li The NDK base directory, if an NDK is present.
+ \row
\li platform
\li string
\li undefined
@@ -67,7 +72,7 @@
tool sets this to the highest version available in the SDK.
\row
\li sdkDir
- \li path
+ \li string
\li undefined
\li The SDK base directory.
\endtable