mc-in-work/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2026-06-29 01:54:20 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: fix PRISMLAUNCHER_JAVA_PATHS

Browse source 
also set Launcher_ENVName as parent scope directly

Signed-off-by: DioEgizio <dioegizio@protonmail.com>
This commit is contained in:
DioEgizio 2026-03-26 21:58:30 +01:00
parent 1ea0c7570f
commit eb44bdc3b3
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
launcher/java/JavaUtils.cpp
View file

@ -156,7 +156,7 @@ JavaInstallPtr JavaUtils::GetDefaultJava()
QStringList addJavasFromEnv(QList<QString> javas) QStringList addJavasFromEnv(QList<QString> javas)
{ {
auto env = qEnvironmentVariable("%1_JAVA_PATHS").arg(BuildConfig.LAUNCHER_ENVNAME); auto env = QProcessEnvironment::systemEnvironment().value(QStringLiteral("%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(";"));

3
program_info/CMakeLists.txt
View file

@ -11,13 +11,12 @@ endif()
set(Launcher_CommonName "PrismLauncher") set(Launcher_CommonName "PrismLauncher")
set(Launcher_DisplayName "Prism Launcher") set(Launcher_DisplayName "Prism Launcher")
set(Launcher_AppID "org.prismlauncher.PrismLauncher") set(Launcher_AppID "org.prismlauncher.PrismLauncher")
set(Launcher_ENVName "PRISMLAUNCHER")
set(Launcher_Domain "prismlauncher.org") set(Launcher_Domain "prismlauncher.org")
set(Launcher_Git "https://github.com/PrismLauncher/PrismLauncher") set(Launcher_Git "https://github.com/PrismLauncher/PrismLauncher")
set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE) set(Launcher_Name "${Launcher_CommonName}" PARENT_SCOPE)
set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE) set(Launcher_DisplayName "${Launcher_DisplayName}" PARENT_SCOPE)
set(Launcher_ENVName "${Launcher_ENVName}" PARENT_SCOPE) set(Launcher_ENVName "PRISMLAUNCHER" PARENT_SCOPE)
set(Launcher_Domain "${Launcher_Domain}" PARENT_SCOPE) set(Launcher_Domain "${Launcher_Domain}" PARENT_SCOPE)
set(Launcher_Git "${Launcher_Git}" PARENT_SCOPE) set(Launcher_Git "${Launcher_Git}" PARENT_SCOPE)