diff options
| author | Sefa Eyeoglu <contact@scrumplex.net> | 2022-07-10 19:38:30 +0200 |
|---|---|---|
| committer | Sefa Eyeoglu <contact@scrumplex.net> | 2022-07-10 19:38:30 +0200 |
| commit | b3b76d5d56f9b6849464a6df2031058c98359fbc (patch) | |
| tree | 211464fb189ef1202093f206d93f3b9f139fd284 /launcher/launch/steps/CheckJava.h | |
| parent | 3bc02b9662b84c2ab86b5de1b08b4537177fde90 (diff) | |
| parent | cd948dceaed4625e7a876f680d3dc028e6cfe6de (diff) | |
| download | PrismLauncher-b3b76d5d56f9b6849464a6df2031058c98359fbc.tar.gz PrismLauncher-b3b76d5d56f9b6849464a6df2031058c98359fbc.tar.bz2 PrismLauncher-b3b76d5d56f9b6849464a6df2031058c98359fbc.zip | |
Merge branch 'develop' into feature/sparkle-mac
# Conflicts:
# .github/workflows/build.yml
Diffstat (limited to 'launcher/launch/steps/CheckJava.h')
| -rw-r--r-- | launcher/launch/steps/CheckJava.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/launcher/launch/steps/CheckJava.h b/launcher/launch/steps/CheckJava.h index 68cd618b..d084b132 100644 --- a/launcher/launch/steps/CheckJava.h +++ b/launcher/launch/steps/CheckJava.h @@ -35,7 +35,7 @@ private slots: void checkJavaFinished(JavaCheckResult result); private: - void printJavaInfo(const QString & version, const QString & architecture, const QString & vendor); + void printJavaInfo(const QString & version, const QString & architecture, const QString & realArchitecture, const QString & vendor); void printSystemInfo(bool javaIsKnown, bool javaIs64bit); private: |