Improve "Qt for Android - Building from Source"

- Mention that Android Studio's JDK can be used
- Fix duplicate "Building Qt" titles so they can be linked to properly
- Fix typos in qdoc commands
- Fix configure command issues:
  - Move make flags out
  - Change android-g++ to android-clang
  - Expand ANDROID_NDK_PATH and ANDROID_NDK_ROOT variables

Task-number: QTCREATORBUG-22626
Change-Id: Iefe9d21ad9b06f792e7c20fb4698c00fa4b24c2a
Reviewed-by: Kavindra Palaraja <kpalaraja@luxoft.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

1 files changed, 9 insertions, 6 deletions

diff --git a/doc/src/platforms/android-building.qdoc b/doc/src/platforms/android-building.qdoc
index de1f6684..3180dbc2 100644
--- a/doc/src/platforms/android-building.qdoc
+++ b/doc/src/platforms/android-building.qdoc
@@ -83,7 +83,7 @@
     \endlist
 
 
-    \section2 Building Qt
+    \section2 Building Qt for Android on Linux
 
     \list 1
         \li If you have a commercially licensed Qt, install your license file. If you're using
@@ -156,6 +156,8 @@
         \li Install the latest JDK from
             \l{https://www.oracle.com/technetwork/java/javase/downloads/index.html}. Then, add the
             \e{<JDK_ROOT>} to \c PATH.
+            Alternatively, if you've installed Android Studio, you can use the JDK that's
+            included in your installation's \c jre folder.
         \li Install the Android NDK, r18b, from
             \l{https://developer.android.com/tools/sdk/ndk/index.html}. Extract it to
             \e{<ANDROID_NDK_PATH>}.
@@ -188,7 +190,7 @@
             \endcode
     \endlist
 
-    \section2 Building Qt
+    \section2 Building Qt for Android on Windows
 
     \list
         \li If you have a commercially licensed Qt, install your license file. If you're using
@@ -203,13 +205,12 @@
             installed, for example: \c{C:\Qt\%VERSION%}. This install path must not contain any
             spaces or Windows-specific file system characters.
 
-        \li Run the following command. \e{<N>} is optional, representing the number of parallel
-            jobs your system can do.
+        \li Run the following command to configure Qt:
 
         \code
         configure.bat -prefix <path to install Qt to> -platform win32-g++ -opengl es2 -xplatform
-        android-g++ -android-ndk ANDROID_NDK_PATH -android-sdk ANDROID_SDK_ROOT -nomake tests
-        -nomake examples mingw32-make.exe -j<N>
+        android-clang -android-ndk %ANDROID_NDK_PATH% -android-sdk %ANDROID_SDK_ROOT% -nomake tests
+        -nomake examples
         \endcode
 
         \li To build the previously configured parts of Qt, run the following command:
@@ -218,6 +219,8 @@
         mingw32-make.exe -j<N>
         \endcode
 
+        \e{<N>} is optional, representing the number of parallel jobs your system can do.
+
         \li Now, to install Qt, run the following command:
 
         \code