Merge branch 'develop' into feat/launcher-updater

This commit is contained in:
Rachel Powers 2023-06-28 10:54:39 -07:00
commit 1b5c78b066
No known key found for this signature in database
GPG key ID: E10E321EB160949B
47 changed files with 222 additions and 1645 deletions

View file

@ -697,7 +697,7 @@ Application::Application(int& argc, char** argv) : QApplication(argc, argv)
// Java Settings
m_settings->registerSetting("JavaPath", "");
m_settings->registerSetting("JavaTimestamp", 0);
m_settings->registerSetting("JavaSignature", "");
m_settings->registerSetting("JavaArchitecture", "");
m_settings->registerSetting("JavaRealArchitecture", "");
m_settings->registerSetting("JavaVersion", "");