Docs: Remove or replace qt 5 content in Android Starter Guide

Updated the table of android NDK vs Qt versions.

Task-number: QTBUG-96785
Change-Id: Id2bf40feee4a6f028209a885ecc95e5a2a8c8be4
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 82f69d5cad2768e02a1f28eebe75252d4550a6ab)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>

1 files changed, 10 insertions, 33 deletions

diff --git a/doc/src/platforms/android/android.qdoc b/doc/src/platforms/android/android.qdoc
index 5b3d8fb6..c9da3f30 100644
--- a/doc/src/platforms/android/android.qdoc
+++ b/doc/src/platforms/android/android.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -75,8 +75,11 @@ The following topics provide more details about Qt for Android:
 \previouspage android.html
 \nextpage android-building.html
 
-\section1 Installing the Prerequisites
+\section1 Installing Qt for Android with Qt Installer
 
+See \l{Get and Install Qt} and select Qt for Android in the installer.
+
+\section1 Manually Installing the Prerequisites
 In order to use \l{Qt for Android}, you need the following:
 
 \list
@@ -87,7 +90,7 @@ In order to use \l{Qt for Android}, you need the following:
         \note JDK 11 or earlier must be used when using Qt for Android.
 
     \li \l{Gradle} for building application packages (APK) and app bundles
-        (AAB) for Android devices. Gradle is delivered with Qt 5.9, and later.
+        (AAB) for Android devices. Gradle is delivered with Qt.
 
         \note Using Ant to build APKs is no longer supported.
 
@@ -111,40 +114,13 @@ In order to use \l{Qt for Android}, you need the following:
         \note If you are using the SDK Tools 26.x or below, the JDK 8 is required.
         Versions higher than 8 might cause issues for \l {android-sdk}{the Android SDK tools}.
 
-        \note If your Qt version is earlier than v5.9, use the SDK tools package
-        v25.2.5 or earlier.
-
     \target android-ndk
     \li \l{Android: The Android NDK}{The Android NDK}
         can be installed using the \c sdkmanager tool. Alternatively, you can
         download it and extract it manually to a path of your choosing.
 \endlist
 
-Different Qt versions depend on different NDK versions, as listed below:
-
-\table
-    \header
-        \li Qt version
-        \li NDK version
-        \li Toolchain
-    \row
-        \li Qt 5.14.0 or later
-            Qt 5.13.2 or later
-            Qt 5.12.6 or later
-        \li NDK r20b or r21
-        \li android-clang
-    \row
-        \li Qt 5.12.0 to 5.12.5
-            Qt 5.13.0 to 5.13.1
-        \li NDK r19c
-        \li android-clang
-    \row
-        \li Qt 5.11 and earlier
-        \li NDK r10e
-        \li GCC toolchain
-\endtable
-
-\note Qt 5.14.0 and 5.14.1 with NDK r21 have a bug fixed at \l {QTBUG-81461}.
+\include supported-platforms.qdocinc android
 
 \note Make sure to unpack the Android SDK and NDK to a writable location that Qt Creator
 can access later. Otherwise, Qt Creator won't be able to use \c sdkmanager or find all
@@ -157,8 +133,7 @@ command line tool to install the essential packages:
 
 \badcode
 cd <ANDROID_SDK_ROOT>/tools/bin/
-./sdkmanager --sdk_root=<ANDROID_SDK_ROOT> --install "cmdline-tools;latest"
-./sdkmanager --sdk_root=<ANDROID_SDK_ROOT> --install "platform-tools" "platforms;android-29" "build-tools;29.0.2" "ndk;21.3.6528147"
+./sdkmanager --sdk_root=<ANDROID_SDK_ROOT> --install "cmdline-tools;latest" "platform-tools" "platforms;android-31" "build-tools;31.0.0" "ndk;22.1.7171670"
 \endcode
 
 \l {Android: Android Studio}{Android Studio} or the Qt Creator's
@@ -189,6 +164,8 @@ After the package installation is complete, install the driver from
 \l{Android: adb}{adb} commands now and check whether your Android device
 responds to them.
 
+\note These are automatically handled by Qt Creator on first time setup.
+
 \section2 Linux
 
 The following dependencies are needed for using tools such as \c adb or \c gdb which