summaryrefslogtreecommitdiffstats
path: root/logic/JavaUtils.cpp
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-10-15 00:30:33 +0100
committerSky <git@bunnies.cc>2013-10-15 00:30:33 +0100
commit7aacf93c7cbfdb92c869bb0ea86e6afa69bfa421 (patch)
tree3ba2f4856fdbe616d37587d0609a5b67e3f9c6ac /logic/JavaUtils.cpp
parentdeffe7db436c39ebaea9f32759fb7c4344420b04 (diff)
downloadMultiMC-7aacf93c7cbfdb92c869bb0ea86e6afa69bfa421.tar
MultiMC-7aacf93c7cbfdb92c869bb0ea86e6afa69bfa421.tar.gz
MultiMC-7aacf93c7cbfdb92c869bb0ea86e6afa69bfa421.tar.lz
MultiMC-7aacf93c7cbfdb92c869bb0ea86e6afa69bfa421.tar.xz
MultiMC-7aacf93c7cbfdb92c869bb0ea86e6afa69bfa421.zip
Fix non-Windows derp
Diffstat (limited to 'logic/JavaUtils.cpp')
-rw-r--r--logic/JavaUtils.cpp21
1 files changed, 15 insertions, 6 deletions
diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp
index c0630545..8e9c984f 100644
--- a/logic/JavaUtils.cpp
+++ b/logic/JavaUtils.cpp
@@ -150,25 +150,34 @@ QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
return javas;
}
#elif OSX
-std::vector<java_install> JavaUtils::FindJavaPaths()
+QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
{
QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
- return this->GetDefaultJava();
+ QList<JavaVersionPtr> javas;
+ javas.append(this->GetDefaultJava());
+
+ return javas;
}
#elif LINUX
-std::vector<java_install> JavaUtils::FindJavaPaths()
+QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
{
QLOG_INFO() << "Linux Java detection incomplete - defaulting to \"java\"";
- return this->GetDefaultJava();
+ QList<JavaVersionPtr> javas;
+ javas.append(this->GetDefaultJava());
+
+ return javas;
}
#else
-std::vector<java_install> JavaUtils::FindJavaPaths()
+QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
{
QLOG_INFO() << "Unknown operating system build - defaulting to \"java\"";
- return this->GetDefaultJava();
+ QList<JavaVersionPtr> javas;
+ javas.append(this->GetDefaultJava());
+
+ return javas;
}
#endif