diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-11-08 20:03:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-08 20:03:08 +0100 |
| commit | 86f6a3e75189bcbd3ee3a3b4a78d7517fc857a96 (patch) | |
| tree | e59c80a757a432a88246477d6db1425b3ce040a0 /launcher/java | |
| parent | 30602363d7879ba82d0153082858b0cd6a1a4c9e (diff) | |
| parent | 06607684789872fbc19009faba4e12dcccb9d493 (diff) | |
| download | PrismLauncher-86f6a3e75189bcbd3ee3a3b4a78d7517fc857a96.tar.gz PrismLauncher-86f6a3e75189bcbd3ee3a3b4a78d7517fc857a96.tar.bz2 PrismLauncher-86f6a3e75189bcbd3ee3a3b4a78d7517fc857a96.zip | |
Merge pull request #4231 from NewoIsTaken/patch-2
GH-4200 Search Eclipse Foundation and Adoptium in Registry
Diffstat (limited to 'launcher/java')
| -rw-r--r-- | launcher/java/JavaUtils.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index c00ee710..d0adf92b 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -265,12 +265,18 @@ 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( + // Foundation (Eclipse) + QList<JavaInstallPtr> FOUNDATIONJDK32s = this->FindJavaFromRegistryKey( KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI"); - QList<JavaInstallPtr> ECLIPSEJDK64s = this->FindJavaFromRegistryKey( + QList<JavaInstallPtr> FOUNDATIONJDK64s = this->FindJavaFromRegistryKey( KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Foundation\\JDK", "Path", "\\hotspot\\MSI"); + // Adoptium (Eclipse) + QList<JavaInstallPtr> ADOPTIUMJDK32s = this->FindJavaFromRegistryKey( + KEY_WOW64_32KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI"); + QList<JavaInstallPtr> ADOPTIUMJDK64s = this->FindJavaFromRegistryKey( + KEY_WOW64_64KEY, "SOFTWARE\\Eclipse Adoptium\\JDK", "Path", "\\hotspot\\MSI"); + // Microsoft QList<JavaInstallPtr> MICROSOFTJDK64s = this->FindJavaFromRegistryKey( KEY_WOW64_64KEY, "SOFTWARE\\Microsoft\\JDK", "Path", "\\hotspot\\MSI"); @@ -297,7 +303,8 @@ QList<QString> JavaUtils::FindJavaPaths() java_candidates.append(JDK64s); java_candidates.append(NEWJDK64s); java_candidates.append(ADOPTOPENJDK64s); - java_candidates.append(ECLIPSEJDK64s); + java_candidates.append(FOUNDATIONJDK64s); + java_candidates.append(ADOPTIUMJDK64s); java_candidates.append(MICROSOFTJDK64s); java_candidates.append(ZULU64s); java_candidates.append(LIBERICA64s); @@ -311,7 +318,8 @@ QList<QString> JavaUtils::FindJavaPaths() java_candidates.append(JDK32s); java_candidates.append(NEWJDK32s); java_candidates.append(ADOPTOPENJDK32s); - java_candidates.append(ECLIPSEJDK32s); + java_candidates.append(FOUNDATIONJDK32s); + java_candidates.append(ADOPTIUMJDK32s); java_candidates.append(ZULU32s); java_candidates.append(LIBERICA32s); |