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

Merge pull request #31 from max96at/feature_osx_polish

Browse Source 
Improved java detection on OSX.
This commit is contained in:
Petr Mrázek
2014-01-02 08:09:57 -08:00
parent aed3ddda29 092b15fc87
commit c85789e249
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
logic/JavaUtils.cpp
View File

@@ -177,10 +177,10 @@ QList<QString> JavaUtils::FindJavaPaths()
#elif OSX #elif OSX
QList<QString> JavaUtils::FindJavaPaths() QList<QString> JavaUtils::FindJavaPaths()
{ {
QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
QList<QString> javas; QList<QString> javas;
javas.append(this->GetDefaultJava()->path); javas.append(this->GetDefaultJava()->path);
javas.append("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java");
javas.append("/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java");
return javas; return javas;
} }