From cdebeff179b78b9acb013cea7a9b71f45bef751d Mon Sep 17 00:00:00 2001
From: Noah Mayr <max96at@gmail.com>
Date: Thu, 2 Jan 2014 17:01:26 +0100
Subject: Improved java detection on OSX.

---
 logic/JavaUtils.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'logic')

diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp
index e1b3bc64..8005c375 100644
--- a/logic/JavaUtils.cpp
+++ b/logic/JavaUtils.cpp
@@ -181,6 +181,8 @@ QList<QString> JavaUtils::FindJavaPaths()
 
 	QList<QString> javas;
 	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;
 }
-- 
cgit v1.2.3


From 092b15fc8716af61472ffdd953429792183b350d Mon Sep 17 00:00:00 2001
From: max96at <max96at@gmail.com>
Date: Thu, 2 Jan 2014 17:07:47 +0100
Subject: Removed incomplete osx java detection log message

---
 logic/JavaUtils.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'logic')

diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp
index 8005c375..cf47df6f 100644
--- a/logic/JavaUtils.cpp
+++ b/logic/JavaUtils.cpp
@@ -177,8 +177,6 @@ QList<QString> JavaUtils::FindJavaPaths()
 #elif OSX
 QList<QString> JavaUtils::FindJavaPaths()
 {
-	QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
-
 	QList<QString> javas;
 	javas.append(this->GetDefaultJava()->path);
 	javas.append("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java");
-- 
cgit v1.2.3


From c0b6fd0647fe90084f3d2750cb26e3b9cb611266 Mon Sep 17 00:00:00 2001
From: Jan Dalheimer <jan@dalheimer.de>
Date: Thu, 2 Jan 2014 18:51:40 +0100
Subject: Make .ico files usable (the plugin is already included)

---
 logic/icons/IconList.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'logic')

diff --git a/logic/icons/IconList.cpp b/logic/icons/IconList.cpp
index 3a745662..cda2db7b 100644
--- a/logic/icons/IconList.cpp
+++ b/logic/icons/IconList.cpp
@@ -258,7 +258,7 @@ void IconList::installIcons(QStringList iconFiles)
 		QString target = PathCombine("icons", fileinfo.fileName());
 
 		QString suffix = fileinfo.suffix();
-		if (suffix != "jpeg" && suffix != "png" && suffix != "jpg")
+		if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico")
 			continue;
 
 		if (!QFile::copy(file, target))
@@ -348,4 +348,4 @@ int IconList::getIconIndex(QString key)
 	return -1;
 }
 
-//#include "IconList.moc"
\ No newline at end of file
+//#include "IconList.moc"
-- 
cgit v1.2.3