diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-29 03:04:49 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-29 03:04:49 +0100 |
| commit | 5dc50d23f437bc8b8754efe6ceddfca517ac9f53 (patch) | |
| tree | 4c8695288286faae0846a4d032a20e581fae4dca | |
| parent | 49591c453fea8bb7f1f80d815496aa57620add53 (diff) | |
| parent | e97e5fc31e55683e93f5a76638c229d6c9d42b0a (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: If8731bb49145d018cfe9c7ce961e98910cfd5f69
| -rw-r--r-- | doc/src/platforms/android.qdoc | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc index a0580ea33..b9d10cadc 100644 --- a/doc/src/platforms/android.qdoc +++ b/doc/src/platforms/android.qdoc @@ -155,9 +155,27 @@ In order to use \l{Qt for Android}, you need the following: \note If your Qt version is earlier than v5.9, use the SDK tools package v25.2.5 or earlier. \li \l{http://developer.android.com/tools/sdk/ndk/index.html}{The Android NDK} - \note Using Qt for Android with the GCC toolchain requires Android NDK - version \e r10e. For Qt 5.12 or later, use the latest - available version of NDK with \e android-clang toolchain. + \list + \li Qt 5.11 and below + \list + \li NDK r10e + \li GCC toolchain + \endlist + \li Qt 5.12.0 to 5.12.5 + and Qt 5.13.0 to 5.13.1 + \list + \li NDK r19c + \li \e android-clang + \endlist + \li Qt 5.14+, Qt 5.13.2+ + and Qt 5.12.6+ + \list + \li NDK r20b or r21 + \li \e android-clang + \li \note Qt 5.14.0 and 5.14.1 with NDK r21 have a bug fixed at \l{https://bugreports.qt.io/browse/QTBUG-81461}{QTBUG-81461}. + \endlist + \endlist + \li \l{http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html}{Java SE Development Kit} (JDK) v6 or later. You can also use \l{http://openjdk.java.net}{OpenJDK} on Linux. \endlist |