mirror of
https://github.com/PrismLauncher/PrismLauncher.git
synced 2026-09-15 07:34:54 -04:00
Avoid transitively including windows.h in JavaUtils.h
Adding MinecraftInstance.h into JavaSettingsWidget.cpp after JavaUtils.h caused an error in a completely different header. Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
2 files changed
+10
-3
No files matched your search
@@ -47,6 +47,13 @@
|
||||
#include "java/JavaInstallList.h"
|
||||
#include "java/JavaUtils.h"
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
#ifndef WIN32_LEAN_AND_MEAN
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define IBUS "@im=ibus"
|
||||
|
||||
JavaUtils::JavaUtils() {}
|
||||
@@ -175,7 +182,7 @@ QStringList addJavasFromEnv(QList<QString> javas)
|
||||
}
|
||||
|
||||
#if defined(Q_OS_WIN32)
|
||||
QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(DWORD keyType, QString keyName, QString keyJavaDir, QString subkeySuffix)
|
||||
QList<JavaInstallPtr> JavaUtils::FindJavaFromRegistryKey(std::uint32_t keyType, QString keyName, QString keyJavaDir, QString subkeySuffix)
|
||||
{
|
||||
QList<JavaInstallPtr> javas;
|
||||
|
||||
|
||||
Reference in new issue
Block a user