From 7aacf93c7cbfdb92c869bb0ea86e6afa69bfa421 Mon Sep 17 00:00:00 2001 From: Sky Date: Tue, 15 Oct 2013 00:30:33 +0100 Subject: [PATCH] Fix non-Windows derp --- logic/JavaUtils.cpp | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp index c06305456..8e9c984f7 100644 --- a/logic/JavaUtils.cpp +++ b/logic/JavaUtils.cpp @@ -150,25 +150,34 @@ QList JavaUtils::FindJavaPaths() return javas; } #elif OSX -std::vector JavaUtils::FindJavaPaths() +QList JavaUtils::FindJavaPaths() { QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\""; - return this->GetDefaultJava(); + QList javas; + javas.append(this->GetDefaultJava()); + + return javas; } #elif LINUX -std::vector JavaUtils::FindJavaPaths() +QList JavaUtils::FindJavaPaths() { QLOG_INFO() << "Linux Java detection incomplete - defaulting to \"java\""; - return this->GetDefaultJava(); + QList javas; + javas.append(this->GetDefaultJava()); + + return javas; } #else -std::vector JavaUtils::FindJavaPaths() +QList JavaUtils::FindJavaPaths() { QLOG_INFO() << "Unknown operating system build - defaulting to \"java\""; - return this->GetDefaultJava(); + QList javas; + javas.append(this->GetDefaultJava()); + + return javas; } #endif