From 1ea0c7570f05b77dbbfa657df3d64c5d84d42e92 Mon Sep 17 00:00:00 2001 From: DioEgizio Date: Thu, 26 Mar 2026 18:19:34 +0100 Subject: [PATCH] fix: dehardcode PRISMLAUNCHER_JAVA_PATHS too Signed-off-by: DioEgizio --- launcher/java/JavaUtils.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/launcher/java/JavaUtils.cpp b/launcher/java/JavaUtils.cpp index 25fe1caa8..868ce5875 100644 --- a/launcher/java/JavaUtils.cpp +++ b/launcher/java/JavaUtils.cpp @@ -45,6 +45,7 @@ #include "FileSystem.h" #include "java/JavaInstallList.h" #include "java/JavaUtils.h" +#include "BuildConfig.h" #define IBUS "@im=ibus" @@ -155,7 +156,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava() QStringList addJavasFromEnv(QList 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) QList javaPaths = env.replace("\\", "/").split(QLatin1String(";"));