diff options
| author | Petr Mrázek <peterix@gmail.com> | 2016-01-02 01:13:42 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2016-01-02 01:13:42 +0100 |
| commit | 1363b1d3649c97dbe4811f99089cf346d4aa1c97 (patch) | |
| tree | 62c9d9a60ce51a63457d16fe133b6dce518764d3 /logic/java | |
| parent | a008efd24e81441a23ff3e81320ac3522251327e (diff) | |
| download | MultiMC-1363b1d3649c97dbe4811f99089cf346d4aa1c97.tar MultiMC-1363b1d3649c97dbe4811f99089cf346d4aa1c97.tar.gz MultiMC-1363b1d3649c97dbe4811f99089cf346d4aa1c97.tar.lz MultiMC-1363b1d3649c97dbe4811f99089cf346d4aa1c97.tar.xz MultiMC-1363b1d3649c97dbe4811f99089cf346d4aa1c97.zip | |
GH-1365 fix java detection OS ifdefs
Diffstat (limited to 'logic/java')
| -rw-r--r-- | logic/java/JavaUtils.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/logic/java/JavaUtils.cpp b/logic/java/JavaUtils.cpp index 9dfb7897..dcff09d3 100644 --- a/logic/java/JavaUtils.cpp +++ b/logic/java/JavaUtils.cpp @@ -51,7 +51,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava() return javaVersion; } -#if WINDOWS +#if defined(Q_OS_WIN32) QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString keyName) { QList<JavaInstallPtr> javas; @@ -170,7 +170,7 @@ QList<QString> JavaUtils::FindJavaPaths() return candidates; } -#elif OSX +#elif defined(Q_OS_MAC) QList<QString> JavaUtils::FindJavaPaths() { QList<QString> javas; @@ -193,7 +193,7 @@ QList<QString> JavaUtils::FindJavaPaths() return javas; } -#elif LINUX +#elif defined(Q_OS_LINUX) QList<QString> JavaUtils::FindJavaPaths() { qDebug() << "Linux Java detection incomplete - defaulting to \"java\""; |