0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

GH-1365 fix java detection OS ifdefs

Browse Source
This commit is contained in:
Petr Mrázek
2016-01-02 01:13:42 +01:00
parent a008efd24e
commit 1363b1d364
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
logic/java/JavaUtils.cpp
View File

@@ -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\"";