summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2018-11-09 13:20:22 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2018-11-10 15:24:18 +0000
commit0ebb236721fbf4acc595e0214866b69097cbe743 (patch)
treea4eb7f26982f600fef3ff1eb571d30b971975fb7
parent7a69052a182215aa9b2584654d855d7cfbd7478c (diff)
downloadqtdoc-0ebb236721fbf4acc595e0214866b69097cbe743.tar.gz
Doc: Recommend using the latest NDK with Qt for Android
Since Qt 5.12, the previously recommended NDK version (r10e) no longer works with the GCC toolchain. Update the recommendation to the latest version and android-clang toolchain. Also update this information in Supported Platforms for Android. Task-number: QTBUG-71690 Change-Id: Ia74d4106db6cf71d626c5863d06ca7c629208bdc Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Martin Smith <martin.smith@qt.io>
-rw-r--r--doc/src/platforms/android.qdoc4
-rw-r--r--doc/src/platforms/supported-platforms.qdocinc2
2 files changed, 4 insertions, 2 deletions
diff --git a/doc/src/platforms/android.qdoc b/doc/src/platforms/android.qdoc
index 812583e6..0418995c 100644
--- a/doc/src/platforms/android.qdoc
+++ b/doc/src/platforms/android.qdoc
@@ -154,7 +154,9 @@ 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}
- (recommended version 10e)
+ \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.
\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
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 6577f3e1..e2b27c6d 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -105,7 +105,7 @@
\header \li Platform Version \li Architecture \li Compiler \li Build Environment
\row \li Android 4.1, 5, 6, 7, 8 (API Level 16)
\li \c armv7 and \c x86
- \li \b {GCC as provided by Google}, \b {MinGW 7.3}
+ \li \b {Clang as provided by Google}, \b {MinGW 7.3}
\li \b {RHEL 7.4 (x86_64)}, \b{\macos 10.13}, \b {Windows 7 (x86_64)}
\endtable
//! [android]