mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2026-06-29 01:54:20 +03:00
fix: dehardcode PRISMLAUNCHER_JAVA_PATHS too
Signed-off-by: DioEgizio <dioegizio@protonmail.com>
This commit is contained in:
parent
bf42cfdcf2
commit
1ea0c7570f
1 changed files with 2 additions and 1 deletions
|
|
@ -45,6 +45,7 @@
|
||||||
#include "FileSystem.h"
|
#include "FileSystem.h"
|
||||||
#include "java/JavaInstallList.h"
|
#include "java/JavaInstallList.h"
|
||||||
#include "java/JavaUtils.h"
|
#include "java/JavaUtils.h"
|
||||||
|
#include "BuildConfig.h"
|
||||||
|
|
||||||
#define IBUS "@im=ibus"
|
#define IBUS "@im=ibus"
|
||||||
|
|
||||||
|
|
@ -155,7 +156,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava()
|
||||||
|
|
||||||
QStringList addJavasFromEnv(QList<QString> javas)
|
QStringList addJavasFromEnv(QList<QString> javas)
|
||||||
{
|
{
|
||||||
auto env = qEnvironmentVariable("PRISMLAUNCHER_JAVA_PATHS"); // FIXME: use launcher name from buildconfig
|
auto env = qEnvironmentVariable("%1_JAVA_PATHS").arg(BuildConfig.LAUNCHER_ENVNAME);
|
||||||
#if defined(Q_OS_WIN32)
|
#if defined(Q_OS_WIN32)
|
||||||
QList<QString> javaPaths = env.replace("\\", "/").split(QLatin1String(";"));
|
QList<QString> javaPaths = env.replace("\\", "/").split(QLatin1String(";"));
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue