Docs: Update Qt for Android support and add RTA-Devices

Changed some wording around supported targets.
Added RTA-Devices table.

Fixes: QTBUG-104103
Fixes: QTQAINFRA-5031
Fixes: QTQAINFRA-5030
Change-Id: I0ace1e064f66c5b802da1e3665a110c2d42226a6
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit b81d6b9529e1398969bacf7299a73776a2d918fb)

3 files changed, 109 insertions, 17 deletions

diff --git a/doc/src/external-resources.qdoc b/doc/src/external-resources.qdoc
index d41c80d3..66e7fe9f 100644
--- a/doc/src/external-resources.qdoc
+++ b/doc/src/external-resources.qdoc
@@ -719,3 +719,44 @@
     \externalpage http://www.qt.io/pricing
     \title Qt pricing
 */
+
+/*!
+    \externalpage https://www.gsmarena.com/samsung_galaxy_tab_s4_10_5-9262.php
+    \title Samsung Galaxy Tab S4
+*/
+
+/*!
+    \externalpage https://www.gsmarena.com/google_pixel_3a-9408.php
+    \title Pixel 3A
+*/
+
+/*!
+    \externalpage https://www.gsmarena.com/google_pixel_4a-10123.php
+    \title Pixel 4A
+*/
+
+/*!
+    \externalpage https://www.gsmarena.com/google_pixel_6_pro-10918.php
+    \title Google Pixel 6 Pro
+*/
+
+/*!
+    \externalpage https://www.gsmarena.com/samsung_galaxy_s21_5g-10626.php
+    \title Samsung Galaxy S21
+*/
+
+/*!
+    \externalpage https://www.gsmarena.com/motorola_moto_g_(3rd_gen)-7247.php
+    \title Motorola MotoG 3rd
+*/
+
+/*!
+    \externalpage https://www.gsmarena.com/samsung_galaxy_s10-9536.php
+    \title Samsung Galaxy S10
+*/
+
+/*!
+    \externalpage https://www.gsmarena.com/google_pixel_4-9896.php
+    \title Pixel 4
+*/
+
diff --git a/doc/src/platforms/android/android.qdoc b/doc/src/platforms/android/android.qdoc
index 74f0a2f5..c63d84bd 100644
--- a/doc/src/platforms/android/android.qdoc
+++ b/doc/src/platforms/android/android.qdoc
@@ -38,10 +38,58 @@ Qt for Android enables you to run Qt applications on Android devices.
 For Qt modules that support android targets see:
 \l{All Modules}{All Supported Qt Modules}.
 
-The following configurations are supported:
+The following development environments and target system configurations are
+supported in Qt \QtVer:
 
 \include supported-platforms.qdocinc android
 
+    \table 50%
+    \header \li {4,1} Target Devices used in Automated Testing
+        \header \li Device \li OS Version \li Architecture \li Form Factor
+        \row \li \l{Pixel 3A}
+             \li Android 10 (API 29)
+             \li armv7, arm64_v8a
+             \li Mobile
+        \row \li \l{Pixel 4A}
+             \li Android 12 (API 31)
+             \li armv7, arm64_v8a
+             \li Mobile
+         \row \li \l{Samsung Galaxy Tab S4}
+             \li Android 10 (API 29)
+             \li armv7, arm64_v8a
+             \li Tablet
+         \row \li \l{Google Pixel 6 Pro}
+             \li Android 13 Beta 4.1
+             \li armv7, arm64_v8a
+             \li Mobile
+         \row \li \l{Samsung Galaxy S21}
+             \li Android 12 (API 31)
+             \li armv7, arm64_v8a
+             \li Mobile
+         \row \li \l{Motorola MotoG 3rd}
+             \li Android 6.0.1 (API 23)
+             \li armv7
+             \li Mobile
+         \row \li Huawei Honor
+             \li Android 6.0.1 (API 23)
+             \li armv7, arm64_v8a
+             \li Mobile
+         \row \li \l{Samsung Galaxy S10}
+             \li Android 9 (API 28)
+             \li armv7, arm64_v8a
+             \li Mobile
+         \row \li \l{Pixel 4}
+             \li Android 11 (API 30)
+             \li armv7, arm64_v8a
+             \li Mobile
+        \endtable
+
+\note Qt for Android support is inclusive of \b{but not limited to} these devices.
+
+\note The above table is accurate at the time of this Qt patch release only.
+It may change during the patch release cycle and should only be used as a
+reference for what the Qt Company can rapidly reproduce bugs on.
+
 Here is what you can do with Qt for Android:
 
 \list
@@ -107,8 +155,9 @@ In order to use \l{Qt for Android}, you need the following:
         essential packages automatically. For more information, see
         \l {Qt Creator: Specifying Android Device Settings}.
 
-        \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}.
+
+    Qt for Android development requires JDK 11 or above, provided by any of the
+    following supported distributions:
 
     \target android-ndk
     \li \l{Android: The Android NDK}{The Android NDK}
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 5767aa13..0164c3d1 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -94,24 +94,26 @@
 
 \section2 \l{Qt for Android}{Android}
 //! [android]
-\table 80%
-    \header \li Distribution \li Architecture \li Compiler \li Notes
-    \row \li Android 6.0 or later (API level 23 or higher)
-        \li \c armv7a, \c x86, \c arm64-v8, and \c x86_64
-        \li Clang 11.0.5 (NDK r22b) as provided by Google, MinGW 11.2
-        \li
-\endtable
+The following configurations are supported in this Qt release:
+    \table 80%
+        \header \li Distribution \li Architecture \li Compiler \li Notes
+        \row \li Android 6.0 or later (API level 23 or higher)
+            \li \c armv7a, \c x86, \c arm64-v8, and \c x86_64
+            \li Clang 11.0.5 (NDK r22b) as provided by Google, MinGW 11.2
+            \li
+    \endtable
+
 //! [android]
 
 \section2 \l{Qt for iOS}{iOS}
 //! [ios]
-\table 80%
-    \header \li Target Platform \li Architecture \li Build Environment \li Notes
-    \row \li iOS 13, iOS 14, iOS 15
-        \li \c armv8 (\c arm64)
-        \li Xcode 12 (iOS 14 SDK), \b {Xcode 13} (iOS 15 SDK)
-        \li
-\endtable
+    \table 80%
+        \header \li Target Platform \li Architecture \li Build Environment \li Notes
+        \row \li iOS 13, iOS 14, iOS 15
+            \li \c armv8 (\c arm64)
+            \li Xcode 12 (iOS 14 SDK), \b {Xcode 13} (iOS 15 SDK)
+            \li
+    \endtable
 //! [ios]
 
 \section2 \l{Qt for WebAssembly}{WebAssembly (Technology Preview)}