mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-12-10 13:48:40 +00:00
Remove Qt from emulator (#3733)
* actions removal * removed qt dir # Conflicts: # src/qt_gui/check_update.cpp # src/qt_gui/translations/ar_SA.ts # src/qt_gui/translations/ca_ES.ts # src/qt_gui/translations/da_DK.ts # src/qt_gui/translations/de_DE.ts # src/qt_gui/translations/el_GR.ts # src/qt_gui/translations/en_US.ts # src/qt_gui/translations/es_ES.ts # src/qt_gui/translations/fa_IR.ts # src/qt_gui/translations/fi_FI.ts # src/qt_gui/translations/fr_FR.ts # src/qt_gui/translations/hu_HU.ts # src/qt_gui/translations/id_ID.ts # src/qt_gui/translations/it_IT.ts # src/qt_gui/translations/ja_JP.ts # src/qt_gui/translations/ko_KR.ts # src/qt_gui/translations/lt_LT.ts # src/qt_gui/translations/nb_NO.ts # src/qt_gui/translations/nl_NL.ts # src/qt_gui/translations/pl_PL.ts # src/qt_gui/translations/pt_BR.ts # src/qt_gui/translations/pt_PT.ts # src/qt_gui/translations/ro_RO.ts # src/qt_gui/translations/ru_RU.ts # src/qt_gui/translations/sl_SI.ts # src/qt_gui/translations/sq_AL.ts # src/qt_gui/translations/sr_CS.ts # src/qt_gui/translations/sv_SE.ts # src/qt_gui/translations/tr_TR.ts # src/qt_gui/translations/uk_UA.ts # src/qt_gui/translations/ur_PK.ts # src/qt_gui/translations/vi_VN.ts # src/qt_gui/translations/zh_CN.ts # src/qt_gui/translations/zh_TW.ts * removed CMakePresets for qt builds * clear cmakelists from qt * sync config file with qtlauncher * fixing review stuff * Remove Qt code from memory patcher and add non-Qt fallback for automatic loading of patches The second feature is disabled if IPC is present, to avoid conflicts with it. * Add json submodule * More Qt removal * Documentation update * fix build * fix REUSE? * removed qrc file * fix clang * Simplify Qt installation instructions for macOS Removed instructions for installing x86_64 Qt on ARM and x86_64 Macs. * Remove Qt installation instructions from guide Removed instructions for downloading and configuring Qt. --------- Co-authored-by: kalaposfos13 <153381648+kalaposfos13@users.noreply.github.com>
This commit is contained in:
@@ -15,10 +15,6 @@
|
||||
#include "common/logging/backend.h"
|
||||
#include "common/logging/log.h"
|
||||
#include "core/ipc/ipc.h"
|
||||
#ifdef ENABLE_QT_GUI
|
||||
#include <QtCore>
|
||||
#endif
|
||||
#include "common/assert.h"
|
||||
#ifdef ENABLE_DISCORD_RPC
|
||||
#include "common/discord_rpc_handler.h"
|
||||
#endif
|
||||
@@ -341,8 +337,6 @@ void Emulator::Run(std::filesystem::path file, std::vector<std::string> args,
|
||||
}
|
||||
#endif
|
||||
|
||||
// Start the timer (Play Time)
|
||||
#ifdef ENABLE_QT_GUI
|
||||
if (!id.empty()) {
|
||||
start_time = std::chrono::steady_clock::now();
|
||||
|
||||
@@ -354,7 +348,6 @@ void Emulator::Run(std::filesystem::path file, std::vector<std::string> args,
|
||||
}
|
||||
}).detach();
|
||||
}
|
||||
#endif
|
||||
|
||||
args.insert(args.begin(), eboot_name.generic_string());
|
||||
linker->Execute(args);
|
||||
@@ -364,9 +357,7 @@ void Emulator::Run(std::filesystem::path file, std::vector<std::string> args,
|
||||
window->WaitEvent();
|
||||
}
|
||||
|
||||
#ifdef ENABLE_QT_GUI
|
||||
UpdatePlayTime(id);
|
||||
#endif
|
||||
|
||||
std::quick_exit(0);
|
||||
}
|
||||
@@ -389,9 +380,9 @@ void Emulator::Restart(std::filesystem::path eboot_path,
|
||||
args.push_back("--ignore-game-patch");
|
||||
}
|
||||
|
||||
if (!MemoryPatcher::patchFile.empty()) {
|
||||
if (!MemoryPatcher::patch_file.empty()) {
|
||||
args.push_back("--patch");
|
||||
args.push_back(MemoryPatcher::patchFile);
|
||||
args.push_back(MemoryPatcher::patch_file);
|
||||
}
|
||||
|
||||
args.push_back("--wait-for-pid");
|
||||
|
||||
Reference in New Issue
Block a user