diff options
| author | phit <2097483+phit@users.noreply.github.com> | 2021-06-18 17:12:44 +0200 |
|---|---|---|
| committer | phit <2097483+phit@users.noreply.github.com> | 2021-06-18 17:12:44 +0200 |
| commit | c2c288a95657b8aa4e0fb56167e9cc4e6551916f (patch) | |
| tree | 27bfb1111ff5445608ef70abb3c81dae0cf6c43b /api | |
| parent | 7ac6c4f3d9f55d4be86c96d0e52001e7ecc5448b (diff) | |
| download | PrismLauncher-c2c288a95657b8aa4e0fb56167e9cc4e6551916f.tar.gz PrismLauncher-c2c288a95657b8aa4e0fb56167e9cc4e6551916f.tar.bz2 PrismLauncher-c2c288a95657b8aa4e0fb56167e9cc4e6551916f.zip | |
NOISSUE Add BellSoft and Azul Java
Diffstat (limited to 'api')
| -rw-r--r-- | api/logic/java/JavaUtils.cpp | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/api/logic/java/JavaUtils.cpp b/api/logic/java/JavaUtils.cpp index 10ffa018..5f004a10 100644 --- a/api/logic/java/JavaUtils.cpp +++ b/api/logic/java/JavaUtils.cpp @@ -269,6 +269,18 @@ QList<QString> JavaUtils::FindJavaPaths() QList<JavaInstallPtr> MICROSOFTJDK64s = this->FindJavaFromRegistryKey( KEY_WOW64_64KEY, "SOFTWARE\\Microsoft\\JDK", "Path", "\\hotspot\\MSI"); + // Azul Zulu + QList<JavaInstallPtr> ZULU64s = this->FindJavaFromRegistryKey( + KEY_WOW64_64KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath"); + QList<JavaInstallPtr> ZULU32s = this->FindJavaFromRegistryKey( + KEY_WOW64_64KEY, "SOFTWARE\\Azul Systems\\Zulu", "InstallationPath"); + + // BellSoft Liberica + QList<JavaInstallPtr> LIBERICA64s = this->FindJavaFromRegistryKey( + KEY_WOW64_64KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath"); + QList<JavaInstallPtr> LIBERICA32s = this->FindJavaFromRegistryKey( + KEY_WOW64_64KEY, "SOFTWARE\\BellSoft\\Liberica", "InstallationPath"); + // List x64 before x86 java_candidates.append(JRE64s); java_candidates.append(NEWJRE64s); @@ -280,6 +292,8 @@ QList<QString> JavaUtils::FindJavaPaths() java_candidates.append(NEWJDK64s); java_candidates.append(ADOPTOPENJDK64s); java_candidates.append(MICROSOFTJDK64s); + java_candidates.append(ZULU64s); + java_candidates.append(LIBERICA64s); java_candidates.append(JRE32s); java_candidates.append(NEWJRE32s); @@ -290,6 +304,8 @@ QList<QString> JavaUtils::FindJavaPaths() java_candidates.append(JDK32s); java_candidates.append(NEWJDK32s); java_candidates.append(ADOPTOPENJDK32s); + java_candidates.append(ZULU32s); + java_candidates.append(LIBERICA32s); java_candidates.append(MakeJavaPtr(this->GetDefaultJava()->path)); |