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

Merge remote-tracking branch 'origin/13.0' into qds/dev

Browse Source 
Change-Id: I3adcadf18eb19344461c5a6a0b6d3aec9045430c
This commit is contained in:
Tim Jenssen
2024-03-13 18:25:08 +01:00
parent 43ee39361f cdad61d08a
commit 6ea8c6290c
81 changed files with 498 additions and 488 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,6 +49,7 @@ using namespace Utils;
namespace Android::Internal {
static Q_LOGGING_CATEGORY(androidsettingswidget, "qtc.android.androidsettingswidget", QtWarningMsg);
constexpr int requiredJavaMajorVersion = 17;
class SummaryWidget : public QWidget
{
@@ -221,7 +222,6 @@ static expected_str<void> testJavaC(const FilePath &jdkPath)
const QString javacCommand("javac");
const QString versionParameter("-version");
constexpr int requiredMajorVersion = 17;
const FilePath bin = jdkPath / "bin" / (javacCommand + QTC_HOST_EXE_SUFFIX);
if (!bin.isExecutableFile())
@@ -254,9 +254,9 @@ static expected_str<void> testJavaC(const FilePath &jdkPath)
jdkVersion = QVersionNumber::fromString(stdOut.mid(outputPrefix.length()).split('\n').first());
if (jdkVersion.isNull() || jdkVersion.majorVersion() != requiredMajorVersion) {
if (jdkVersion.isNull() || jdkVersion.majorVersion() != requiredJavaMajorVersion) {
return make_unexpected(Tr::tr("Unsupported JDK version (needs to be %1): %2 (parsed: %3)")
.arg(requiredMajorVersion)
.arg(requiredJavaMajorVersion)
.arg(stdOut)
.arg(jdkVersion.toString()));
}
@@ -692,10 +692,10 @@ void AndroidSettingsWidget::openNDKDownloadUrl()
void AndroidSettingsWidget::openOpenJDKDownloadUrl()
{
if (HostOsInfo::isLinuxHost())
QDesktopServices::openUrl(QUrl::fromUserInput("https://openjdk.java.net/install/"));
else
QDesktopServices::openUrl(QUrl::fromUserInput("https://adoptopenjdk.net/"));
const QString url =
QString::fromLatin1("https://adoptium.net/temurin/releases/?package=jdk&version=%1")
.arg(requiredJavaMajorVersion);
QDesktopServices::openUrl(QUrl::fromUserInput(url));
}
void AndroidSettingsWidget::downloadOpenSslRepo(const bool silent)