diff --git a/doc/qtcreator/src/android/androiddev.qdoc b/doc/qtcreator/src/android/androiddev.qdoc index 950fe6e9aae..6af2926a080 100644 --- a/doc/qtcreator/src/android/androiddev.qdoc +++ b/doc/qtcreator/src/android/androiddev.qdoc @@ -57,11 +57,11 @@ To use \QC to develop Qt applications for Android, you need the following: \list - \li \l{https://www.oracle.com/java/technologies/javase-jdk8-downloads.html} - {Java SE Development Kit (JDK)} version 6 up to 8. - You can also use \l{http://openjdk.java.net/}{OpenJDK} on Linux. + \li \l{AdoptOpenJDK} for all platforms. You can also use \l{OpenJDK} + on Linux. - \note Android SDK Tools have issues with JDK versions later than 8. + \note Android SDK Tools versions <= 26.x have issues with JDK versions + later than 8. It is recommended to use the latest Command-line SDK Tools. \li \l{http://www.gradle.org}{Gradle} for building application packages (APK) and app bundles (AAB) for Android devices. Gradle is delivered diff --git a/doc/qtcreator/src/external-resources/external-resources.qdoc b/doc/qtcreator/src/external-resources/external-resources.qdoc index ba1517344f1..9114cfe3ee9 100644 --- a/doc/qtcreator/src/external-resources/external-resources.qdoc +++ b/doc/qtcreator/src/external-resources/external-resources.qdoc @@ -45,3 +45,11 @@ \externalpage https://doc.qt.io/QtForMCUs/qtul-getting-started-windows.html \title Getting Started on Windows */ +/*! + \externalpage https://adoptopenjdk.net/ + \title AdoptOpenJDK +*/ +/*! + \externalpage http://openjdk.java.net + \title OpenJDK +*/ diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 404d3e1952c..b5aa0455897 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -454,8 +454,6 @@ AndroidSettingsWidget::AndroidSettingsWidget() m_ui.AVDTableView->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); m_ui.AVDTableView->horizontalHeader()->setSectionResizeMode(1, QHeaderView::ResizeToContents); - m_ui.downloadOpenJDKToolButton->setVisible(!HostOsInfo::isLinuxHost()); - const QIcon downloadIcon = Icons::ONLINE.icon(); m_ui.downloadSDKToolButton->setIcon(downloadIcon); m_ui.downloadNDKToolButton->setIcon(downloadIcon); @@ -696,7 +694,10 @@ void AndroidSettingsWidget::openNDKDownloadUrl() void AndroidSettingsWidget::openOpenJDKDownloadUrl() { - QDesktopServices::openUrl(QUrl::fromUserInput("https://www.oracle.com/java/technologies/javase-jdk8-downloads.html")); + if (HostOsInfo::isLinuxHost()) + QDesktopServices::openUrl(QUrl::fromUserInput("https://openjdk.java.net/install/")); + else + QDesktopServices::openUrl(QUrl::fromUserInput("https://adoptopenjdk.net/")); } void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)