diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-03-26 18:53:44 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-07-08 10:40:43 +0000 |
| commit | f0794797564041ba8bbe7553b07aef4a1f74a047 (patch) | |
| tree | 60335fadc87fae066eb968cf42b68f31bb6902db /src/plugins/android/androidsettingswidget.cpp | |
| parent | 8170501502623a0418156f1f880cf7e4f85c34c7 (diff) | |
| download | qt-creator-f0794797564041ba8bbe7553b07aef4a1f74a047.tar.gz | |
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 <alessandro.portale@qt.io>
Diffstat (limited to 'src/plugins/android/androidsettingswidget.cpp')
| -rw-r--r-- | src/plugins/android/androidsettingswidget.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
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."); |