diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-06-18 19:14:15 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-18 19:14:15 +0200 |
| commit | 0c147fb5eeed4cfeab1209042097c87fa545b1eb (patch) | |
| tree | 4968b88ab360928b0accc52d5e909fdebcd523b6 /api/logic/java/JavaUtils.h | |
| parent | 09ce3d8f40fabf761077aff4231ad9ca4fc0da4c (diff) | |
| parent | c2c288a95657b8aa4e0fb56167e9cc4e6551916f (diff) | |
| download | PrismLauncher-0c147fb5eeed4cfeab1209042097c87fa545b1eb.tar.gz PrismLauncher-0c147fb5eeed4cfeab1209042097c87fa545b1eb.tar.bz2 PrismLauncher-0c147fb5eeed4cfeab1209042097c87fa545b1eb.zip | |
Merge pull request #3843 from phit/adoptjdkdetection
Update Java detection
Diffstat (limited to 'api/logic/java/JavaUtils.h')
| -rw-r--r-- | api/logic/java/JavaUtils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/api/logic/java/JavaUtils.h b/api/logic/java/JavaUtils.h index 7474c494..206acf89 100644 --- a/api/logic/java/JavaUtils.h +++ b/api/logic/java/JavaUtils.h @@ -39,6 +39,6 @@ public: JavaInstallPtr GetDefaultJava(); #ifdef Q_OS_WIN - QList<JavaInstallPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName); + QList<JavaInstallPtr> FindJavaFromRegistryKey(DWORD keyType, QString keyName, QString keyJavaDir, QString subkeySuffix = ""); #endif }; |