From b963ff7416ef78308792b9693de0b47c0888054a Mon Sep 17 00:00:00 2001 From: Sky Date: Thu, 12 Dec 2013 15:04:24 +0000 Subject: [PATCH] Don't break Linux and OS X builds :( --- logic/JavaUtils.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp index 91463688..278046e9 100644 --- a/logic/JavaUtils.cpp +++ b/logic/JavaUtils.cpp @@ -177,33 +177,33 @@ QList JavaUtils::FindJavaPaths() } #elif OSX -QList JavaUtils::FindJavaPaths() +QList JavaUtils::FindJavaPaths() { QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\""; - QList javas; - javas.append(this->GetDefaultJava()); + QList javas; + javas.append(this->GetDefaultJava()->path); return javas; } #elif LINUX -QList JavaUtils::FindJavaPaths() +QList JavaUtils::FindJavaPaths() { QLOG_INFO() << "Linux Java detection incomplete - defaulting to \"java\""; - QList javas; - javas.append(this->GetDefaultJava()); + QList javas; + javas.append(this->GetDefaultJava()->path); return javas; } #else -QList JavaUtils::FindJavaPaths() +QList JavaUtils::FindJavaPaths() { QLOG_INFO() << "Unknown operating system build - defaulting to \"java\""; - QList javas; - javas.append(this->GetDefaultJava()); + QList javas; + javas.append(this->GetDefaultJava()->path); return javas; }