summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-12-12 15:04:24 +0000
committerSky <git@bunnies.cc>2013-12-12 15:04:24 +0000
commitb963ff7416ef78308792b9693de0b47c0888054a (patch)
treed3d763647e4e54103f25d21b458a9fb665714855
parenta2b094102999af646dd1dd962ced435197466b97 (diff)
downloadMultiMC-b963ff7416ef78308792b9693de0b47c0888054a.tar
MultiMC-b963ff7416ef78308792b9693de0b47c0888054a.tar.gz
MultiMC-b963ff7416ef78308792b9693de0b47c0888054a.tar.lz
MultiMC-b963ff7416ef78308792b9693de0b47c0888054a.tar.xz
MultiMC-b963ff7416ef78308792b9693de0b47c0888054a.zip
Don't break Linux and OS X builds :(
-rw-r--r--logic/JavaUtils.cpp18
1 files 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<QString> JavaUtils::FindJavaPaths()
}
#elif OSX
-QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
+QList<QString> JavaUtils::FindJavaPaths()
{
QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
- QList<JavaVersionPtr> javas;
- javas.append(this->GetDefaultJava());
+ QList<QString> javas;
+ javas.append(this->GetDefaultJava()->path);
return javas;
}
#elif LINUX
-QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
+QList<QString> JavaUtils::FindJavaPaths()
{
QLOG_INFO() << "Linux Java detection incomplete - defaulting to \"java\"";
- QList<JavaVersionPtr> javas;
- javas.append(this->GetDefaultJava());
+ QList<QString> javas;
+ javas.append(this->GetDefaultJava()->path);
return javas;
}
#else
-QList<JavaVersionPtr> JavaUtils::FindJavaPaths()
+QList<QString> JavaUtils::FindJavaPaths()
{
QLOG_INFO() << "Unknown operating system build - defaulting to \"java\"";
- QList<JavaVersionPtr> javas;
- javas.append(this->GetDefaultJava());
+ QList<QString> javas;
+ javas.append(this->GetDefaultJava()->path);
return javas;
}