diff options
| author | Alessandro Portale <alessandro.portale@qt.io> | 2024-04-24 16:26:21 +0200 |
|---|---|---|
| committer | Alessandro Portale <alessandro.portale@qt.io> | 2024-04-30 12:54:28 +0000 |
| commit | fcf3cf47709c40378e170e2542116fea1cd7185c (patch) | |
| tree | da8e07398484f090878a418bc2ba407370dcfcb4 | |
| parent | 289b42aba4a329f77e16fc78dc4ffe0e67226619 (diff) | |
Android: Allow users to use other Java versions than 1713.0
Fixes: QTCREATORBUG-30684
Change-Id: I59940f43530fe5f36fdf4fc1655365ff321619f9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Marcus Tillmanns <marcus.tillmanns@qt.io>
Reviewed-by: hjk <hjk@qt.io>
| -rw-r--r-- | src/plugins/android/androidsettingswidget.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index cb67d9fbeb..86034b9373 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -254,7 +254,7 @@ static expected_str<void> testJavaC(const FilePath &jdkPath) jdkVersion = QVersionNumber::fromString(stdOut.mid(outputPrefix.length()).split('\n').first()); - if (jdkVersion.isNull() || jdkVersion.majorVersion() != requiredJavaMajorVersion) { + if (jdkVersion.isNull() /* || jdkVersion.majorVersion() != requiredJavaMajorVersion */ ) { return make_unexpected(Tr::tr("Unsupported JDK version (needs to be %1): %2 (parsed: %3)") .arg(requiredJavaMajorVersion) .arg(stdOut) |