diff options
| author | Nicholas Bennett <nicholas.bennett@qt.io> | 2023-01-12 08:53:45 +0100 |
|---|---|---|
| committer | Nicholas Bennett <nicholas.bennett@qt.io> | 2023-01-16 12:01:48 +0000 |
| commit | 1ad48d103e985d28086237eb6c89f7b068923b18 (patch) | |
| tree | 1730b4e1a53ed10842d9e3ce1fff0edc01d8f20d | |
| parent | 9256452395a865afaab3f8d54d463fe623e7dad8 (diff) | |
Docs: Update JDK requirements to 11 or later
Changed "earlier" to "later" on the android getting started page
and the building Qt for Android page.
Fixes: QTBUG-110064
Change-Id: I92efce99dc8c906a3bbbee74a3c9de19e0bc7e9d
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Tero Alamäki <tero.alamaki@qt.io>
| -rw-r--r-- | doc/src/platforms/android/android-building.qdoc | 6 | ||||
| -rw-r--r-- | doc/src/platforms/android/android.qdoc | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/doc/src/platforms/android/android-building.qdoc b/doc/src/platforms/android/android-building.qdoc index 8b88efa42..942753cc9 100644 --- a/doc/src/platforms/android/android-building.qdoc +++ b/doc/src/platforms/android/android-building.qdoc @@ -104,11 +104,11 @@ preferably at the end of \c{~/.profile}: \badcode - export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64 + export JAVA_HOME=/usr/lib/jvm/java-11-openjdk-amd64 export PATH=$JAVA_HOME/bin:$PATH \endcode - \note JDK 11 or earlier must be used to properly build Qt for Android. + \note \note As of Qt 5.15.8, JDK 11 or later is supported for Qt for Android. \note We use \l{OpenJDK} here, but you can also use other JDK alternatives such as \l{AdoptOpenJDK}. @@ -190,8 +190,6 @@ The command should list javac.exe under the path \e {<JDK_ROOT>} first. - \note JDK 11 or earlier must be used to properly build Qt for Android. - \note Qt for Android does not support building with Microsoft Visual C++ (MSVC), we only support building with MinGW. diff --git a/doc/src/platforms/android/android.qdoc b/doc/src/platforms/android/android.qdoc index 576056f17..e5e4ffd28 100644 --- a/doc/src/platforms/android/android.qdoc +++ b/doc/src/platforms/android/android.qdoc @@ -98,7 +98,7 @@ In order to use \l{Qt for Android}, you need the following: is required to build Android apps. Other alternatives such as \l{OpenJDK} for Linux or \l{Java SE Development Kit} for Windows are also supported. - \note JDK 11 or earlier must be used when using Qt for Android. + \note As of Qt 5.15.8, JDK 11 or later is supported for 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. |