diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-08-09 19:14:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-09 19:14:23 +0200 |
| commit | fca2e9e44cb44004eec7f47c03b186bd5e44dc32 (patch) | |
| tree | afc2a29f8aae632b38cb4f6cae8cf2b4f92725c4 /launcher | |
| parent | 17af6d70b46fecc22d6e7d08c39a8210d724eaec (diff) | |
| parent | c2ec2a4af59a2da8521425387fc0483e85817186 (diff) | |
| download | PrismLauncher-fca2e9e44cb44004eec7f47c03b186bd5e44dc32.tar.gz PrismLauncher-fca2e9e44cb44004eec7f47c03b186bd5e44dc32.tar.bz2 PrismLauncher-fca2e9e44cb44004eec7f47c03b186bd5e44dc32.zip | |
Merge pull request #3997 from phit/detectadoptium
GH-3996 Detect Adoptium JDK's
Diffstat (limited to 'launcher')
| -rw-r--r-- | launcher/java/JavaUtils.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 4b231e6a..c00ee710 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -265,6 +265,12 @@ QList<QString> JavaUtils::FindJavaPaths() QList<JavaInstallPtr> ADOPTOPENJDK64s = this->FindJavaFromRegistryKey( KEY_WOW64_64KEY, "SOFTWARE\\AdoptOpenJDK\\JDK", "Path", "\\hotspot\\MSI"); + // Adoptium (Eclipse) + QList<JavaInstallPtr> ECLIPSEJDK32s = this->FindJavaFromRegistryKey( + KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI"); + QList<JavaInstallPtr> ECLIPSEJDK64s = this->FindJavaFromRegistryKey( + KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI"); + // Microsoft QList<JavaInstallPtr> MICROSOFTJDK64s = this->FindJavaFromRegistryKey( KEY_WOW64_64KEY, "SOFTWARE\\Microsoft\\JDK", "Path", "\\hotspot\\MSI"); @@ -291,6 +297,7 @@ QList<QString> JavaUtils::FindJavaPaths() java_candidates.append(JDK64s); java_candidates.append(NEWJDK64s); java_candidates.append(ADOPTOPENJDK64s); + java_candidates.append(ECLIPSEJDK64s); java_candidates.append(MICROSOFTJDK64s); java_candidates.append(ZULU64s); java_candidates.append(LIBERICA64s); @@ -304,6 +311,7 @@ QList<QString> JavaUtils::FindJavaPaths() java_candidates.append(JDK32s); java_candidates.append(NEWJDK32s); java_candidates.append(ADOPTOPENJDK32s); + java_candidates.append(ECLIPSEJDK32s); java_candidates.append(ZULU32s); java_candidates.append(LIBERICA32s); |