feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: recommend AdoptOpenJDK in settings UI and docs

Browse Source 
Show JDK downlaod button on Linux and point it to OpenJDK becuse
it's the most used on Linux. Otherwise, recommend AdoptOpenJDK because
it works on all platforms and easy to install as well.

Change-Id: I94fd61262fe759b96db59a9e2abfbd063f6795f0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Assam Boudjelthia
2020-06-26 14:37:48 +03:00
parent 2caedc7134
commit c90d1c61ce
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
doc/qtcreator/src/android/androiddev.qdoc
View File

@@ -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

8
doc/qtcreator/src/external-resources/external-resources.qdoc
View File

@@ -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
*/

7
src/plugins/android/androidsettingswidget.cpp
View File

@@ -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)