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

Don't break Linux and OS X builds :(

Browse Source
This commit is contained in:
Sky 2013-12-12 15:04:24 +00:00
parent a2b0941029
commit b963ff7416
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
logic/JavaUtils.cpp
View File

@ -177,33 +177,33 @@ QList<QString> JavaUtils::FindJavaPaths()
} }
#elif OSX #elif OSX
QList<JavaVersionPtr> JavaUtils::FindJavaPaths() QList<QString> JavaUtils::FindJavaPaths()
{ {
QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\""; QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
QList<JavaVersionPtr> javas; QList<QString> javas;
javas.append(this->GetDefaultJava()); javas.append(this->GetDefaultJava()->path);
return javas; return javas;
} }
#elif LINUX #elif LINUX
QList<JavaVersionPtr> JavaUtils::FindJavaPaths() QList<QString> JavaUtils::FindJavaPaths()
{ {
QLOG_INFO() << "Linux Java detection incomplete - defaulting to \"java\""; QLOG_INFO() << "Linux Java detection incomplete - defaulting to \"java\"";
QList<JavaVersionPtr> javas; QList<QString> javas;
javas.append(this->GetDefaultJava()); javas.append(this->GetDefaultJava()->path);
return javas; return javas;
} }
#else #else
QList<JavaVersionPtr> JavaUtils::FindJavaPaths() QList<QString> JavaUtils::FindJavaPaths()
{ {
QLOG_INFO() << "Unknown operating system build - defaulting to \"java\""; QLOG_INFO() << "Unknown operating system build - defaulting to \"java\"";
QList<JavaVersionPtr> javas; QList<QString> javas;
javas.append(this->GetDefaultJava()); javas.append(this->GetDefaultJava()->path);
return javas; return javas;
} }