From f0794797564041ba8bbe7553b07aef4a1f74a047 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Sat, 26 Mar 2022 18:53:44 +0200 Subject: Android: Look for latest JDK version and not 1.8 specifically Recent SDK Manager that is used by Qt Creator works with JDK 11+, and JDK 11 is needed by Qt 5.15.7+, so look for the newest JDK instead of 1.8 as currently being done. Change-Id: I6ff415aa300d742735e8636b24a03116d5bfe2b6 Reviewed-by: Alessandro Portale --- src/plugins/android/androidsettingswidget.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/plugins/android/androidsettingswidget.cpp') diff --git a/src/plugins/android/androidsettingswidget.cpp b/src/plugins/android/androidsettingswidget.cpp index 2b0a5864f8..660c111331 100644 --- a/src/plugins/android/androidsettingswidget.cpp +++ b/src/plugins/android/androidsettingswidget.cpp @@ -301,9 +301,8 @@ AndroidSettingsWidget::AndroidSettingsWidget() tr("Android SDK path exists and is writable."); androidValidationPoints[JavaPathExistsAndWritableRow] = tr("JDK path exists and is writable."); androidValidationPoints[SdkToolsInstalledRow] = tr("SDK tools installed."); + androidValidationPoints[SdkManagerSuccessfulRow] = tr("SDK manager runs."); androidValidationPoints[PlatformToolsInstalledRow] = tr("Platform tools installed."); - androidValidationPoints[SdkManagerSuccessfulRow] = tr( - "SDK manager runs (SDK Tools versions <= 26.x require exactly Java 1.8)."); androidValidationPoints[AllEssentialsInstalledRow] = tr( "All essential packages installed for all installed Qt versions."); androidValidationPoints[BuildToolsInstalledRow] = tr("Build tools installed."); -- cgit v1.2.1