From fcf3cf47709c40378e170e2542116fea1cd7185c Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 24 Apr 2024 16:26:21 +0200 Subject: [PATCH] Android: Allow users to use other Java versions than 17 Fixes: QTCREATORBUG-30684 Change-Id: I59940f43530fe5f36fdf4fc1655365ff321619f9 Reviewed-by: Reviewed-by: Marcus Tillmanns Reviewed-by: hjk --- src/plugins/android/androidsettingswidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index cb67d9fbeb7..86034b9373e 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -254,7 +254,7 @@ static expected_str 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)