CCF_100
/
suyu-mirror
mirror of https://git.suyu.dev/suyu/suyu
1
0
Fork 0
Code Issues Releases Wiki Activity

yuzu/CMakeLists: Remove qt5_wrap_ui macro usage 

We can simply enable CMAKE_AUTOUIC and let CMake take care of handling
the UI code generation for targets.

As part of letting CMake automatically handle the header file parsing,
we must not name includes with "ui_*" unless they're related to the
output of the Qt UIC compiler. Because of this, we need to rename
ui_settings, given it would conflict with this restriction.
merge-requests/60/head
Lioncash 2019-07-29 16:06:33 +07:00
parent f601f25bcc
commit 5980aa1e51
16 changed files with 41 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/yuzu/CMakeLists.txt
Unescape Escape View File

@ -1,5 +1,6 @@
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules)
@ -7,6 +8,7 @@ add_executable(yuzu
Info.plist Info.plist
about_dialog.cpp about_dialog.cpp
about_dialog.h about_dialog.h
aboutdialog.ui
applets/error.cpp applets/error.cpp
applets/error.h applets/error.h
applets/profile_select.cpp applets/profile_select.cpp
@ -17,42 +19,59 @@ add_executable(yuzu
applets/web_browser.h applets/web_browser.h
bootmanager.cpp bootmanager.cpp
bootmanager.h bootmanager.h
compatdb.ui
compatibility_list.cpp compatibility_list.cpp
compatibility_list.h compatibility_list.h
configuration/config.cpp configuration/config.cpp
configuration/config.h configuration/config.h
configuration/configure.ui
configuration/configure_audio.cpp configuration/configure_audio.cpp
configuration/configure_audio.h configuration/configure_audio.h
configuration/configure_audio.ui
configuration/configure_debug.cpp configuration/configure_debug.cpp
configuration/configure_debug.h configuration/configure_debug.h
configuration/configure_debug.ui
configuration/configure_dialog.cpp configuration/configure_dialog.cpp
configuration/configure_dialog.h configuration/configure_dialog.h
configuration/configure_gamelist.cpp configuration/configure_gamelist.cpp
configuration/configure_gamelist.h configuration/configure_gamelist.h
configuration/configure_gamelist.ui
configuration/configure_general.cpp configuration/configure_general.cpp
configuration/configure_general.h configuration/configure_general.h
configuration/configure_general.ui
configuration/configure_graphics.cpp configuration/configure_graphics.cpp
configuration/configure_graphics.h configuration/configure_graphics.h
configuration/configure_graphics.ui
configuration/configure_hotkeys.cpp configuration/configure_hotkeys.cpp
configuration/configure_hotkeys.h configuration/configure_hotkeys.h
configuration/configure_hotkeys.ui
configuration/configure_input.cpp configuration/configure_input.cpp
configuration/configure_input.h configuration/configure_input.h
configuration/configure_input.ui
configuration/configure_input_player.cpp configuration/configure_input_player.cpp
configuration/configure_input_player.h configuration/configure_input_player.h
configuration/configure_input_player.ui
configuration/configure_input_simple.cpp configuration/configure_input_simple.cpp
configuration/configure_input_simple.h configuration/configure_input_simple.h
configuration/configure_input_simple.ui
configuration/configure_mouse_advanced.cpp configuration/configure_mouse_advanced.cpp
configuration/configure_mouse_advanced.h configuration/configure_mouse_advanced.h
configuration/configure_profile_manager.cpp configuration/configure_mouse_advanced.ui
configuration/configure_profile_manager.h
configuration/configure_system.cpp
configuration/configure_system.h
configuration/configure_per_general.cpp configuration/configure_per_general.cpp
configuration/configure_per_general.h configuration/configure_per_general.h
configuration/configure_per_general.ui
configuration/configure_profile_manager.cpp
configuration/configure_profile_manager.h
configuration/configure_profile_manager.ui
configuration/configure_system.cpp
configuration/configure_system.h
configuration/configure_system.ui
configuration/configure_touchscreen_advanced.cpp configuration/configure_touchscreen_advanced.cpp
configuration/configure_touchscreen_advanced.h configuration/configure_touchscreen_advanced.h
configuration/configure_touchscreen_advanced.ui
configuration/configure_web.cpp configuration/configure_web.cpp
configuration/configure_web.h configuration/configure_web.h
configuration/configure_web.ui
debugger/graphics/graphics_breakpoint_observer.cpp debugger/graphics/graphics_breakpoint_observer.cpp
debugger/graphics/graphics_breakpoint_observer.h debugger/graphics/graphics_breakpoint_observer.h
debugger/graphics/graphics_breakpoints.cpp debugger/graphics/graphics_breakpoints.cpp
@ -72,12 +91,14 @@ add_executable(yuzu
game_list_worker.h game_list_worker.h
loading_screen.cpp loading_screen.cpp
loading_screen.h loading_screen.h
loading_screen.ui
hotkeys.cpp hotkeys.cpp
hotkeys.h hotkeys.h
main.cpp main.cpp
main.h main.h
ui_settings.cpp main.ui
ui_settings.h uisettings.cpp
uisettings.h
util/limitable_input_dialog.cpp util/limitable_input_dialog.cpp
util/limitable_input_dialog.h util/limitable_input_dialog.h
util/sequence_dialog/sequence_dialog.cpp util/sequence_dialog/sequence_dialog.cpp
@ -89,44 +110,18 @@ add_executable(yuzu
yuzu.rc yuzu.rc
) )
set(UIS
aboutdialog.ui
configuration/configure.ui
configuration/configure_audio.ui
configuration/configure_debug.ui
configuration/configure_gamelist.ui
configuration/configure_general.ui
configuration/configure_graphics.ui
configuration/configure_hotkeys.ui
configuration/configure_input.ui
configuration/configure_input_player.ui
configuration/configure_input_simple.ui
configuration/configure_mouse_advanced.ui
configuration/configure_per_general.ui
configuration/configure_profile_manager.ui
configuration/configure_system.ui
configuration/configure_touchscreen_advanced.ui
configuration/configure_web.ui
compatdb.ui
loading_screen.ui
main.ui
)
file(GLOB COMPAT_LIST file(GLOB COMPAT_LIST
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.qrc
${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json) ${PROJECT_BINARY_DIR}/dist/compatibility_list/compatibility_list.json)
file(GLOB_RECURSE ICONS ${PROJECT_SOURCE_DIR}/dist/icons/*) file(GLOB_RECURSE ICONS ${PROJECT_SOURCE_DIR}/dist/icons/*)
file(GLOB_RECURSE THEMES ${PROJECT_SOURCE_DIR}/dist/qt_themes/*) file(GLOB_RECURSE THEMES ${PROJECT_SOURCE_DIR}/dist/qt_themes/*)
qt5_wrap_ui(UI_HDRS ${UIS})
target_sources(yuzu target_sources(yuzu
PRIVATE PRIVATE
${COMPAT_LIST} ${COMPAT_LIST}
${ICONS} ${ICONS}
${THEMES} ${THEMES}
${UI_HDRS}
${UIS}
) )
if (APPLE) if (APPLE)

2
src/yuzu/configuration/config.cpp
Unescape Escape View File

@ -11,7 +11,7 @@
#include "core/hle/service/hid/controllers/npad.h" #include "core/hle/service/hid/controllers/npad.h"
#include "input_common/main.h" #include "input_common/main.h"
#include "yuzu/configuration/config.h" #include "yuzu/configuration/config.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
Config::Config() { Config::Config() {
// TODO: Don't hardcode the path; let the frontend decide where to put the config files. // TODO: Don't hardcode the path; let the frontend decide where to put the config files.

2
src/yuzu/configuration/configure_debug.cpp
Unescape Escape View File

@ -12,7 +12,7 @@
#include "ui_configure_debug.h" #include "ui_configure_debug.h"
#include "yuzu/configuration/configure_debug.h" #include "yuzu/configuration/configure_debug.h"
#include "yuzu/debugger/console.h" #include "yuzu/debugger/console.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureDebug) { ConfigureDebug::ConfigureDebug(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureDebug) {
ui->setupUi(this); ui->setupUi(this);

2
src/yuzu/configuration/configure_gamelist.cpp
Unescape Escape View File

@ -9,7 +9,7 @@
#include "core/settings.h" #include "core/settings.h"
#include "ui_configure_gamelist.h" #include "ui_configure_gamelist.h"
#include "yuzu/configuration/configure_gamelist.h" #include "yuzu/configuration/configure_gamelist.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
namespace { namespace {
constexpr std::array default_icon_sizes{ constexpr std::array default_icon_sizes{

2
src/yuzu/configuration/configure_general.cpp
Unescape Escape View File

@ -6,7 +6,7 @@
#include "core/settings.h" #include "core/settings.h"
#include "ui_configure_general.h" #include "ui_configure_general.h"
#include "yuzu/configuration/configure_general.h" #include "yuzu/configuration/configure_general.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
ConfigureGeneral::ConfigureGeneral(QWidget* parent) ConfigureGeneral::ConfigureGeneral(QWidget* parent)
: QWidget(parent), ui(new Ui::ConfigureGeneral) { : QWidget(parent), ui(new Ui::ConfigureGeneral) {

2
src/yuzu/configuration/configure_input_simple.cpp
Unescape Escape View File

@ -9,7 +9,7 @@
#include "yuzu/configuration/configure_input.h" #include "yuzu/configuration/configure_input.h"
#include "yuzu/configuration/configure_input_player.h" #include "yuzu/configuration/configure_input_player.h"
#include "yuzu/configuration/configure_input_simple.h" #include "yuzu/configuration/configure_input_simple.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
namespace { namespace {

2
src/yuzu/configuration/configure_per_general.cpp
Unescape Escape View File

@ -23,7 +23,7 @@
#include "yuzu/configuration/config.h" #include "yuzu/configuration/config.h"
#include "yuzu/configuration/configure_input.h" #include "yuzu/configuration/configure_input.h"
#include "yuzu/configuration/configure_per_general.h" #include "yuzu/configuration/configure_per_general.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
#include "yuzu/util/util.h" #include "yuzu/util/util.h"
ConfigurePerGameGeneral::ConfigurePerGameGeneral(QWidget* parent, u64 title_id) ConfigurePerGameGeneral::ConfigurePerGameGeneral(QWidget* parent, u64 title_id)

2
src/yuzu/configuration/configure_web.cpp
Unescape Escape View File

@ -9,7 +9,7 @@
#include "core/telemetry_session.h" #include "core/telemetry_session.h"
#include "ui_configure_web.h" #include "ui_configure_web.h"
#include "yuzu/configuration/configure_web.h" #include "yuzu/configuration/configure_web.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
ConfigureWeb::ConfigureWeb(QWidget* parent) ConfigureWeb::ConfigureWeb(QWidget* parent)
: QWidget(parent), ui(std::make_unique<Ui::ConfigureWeb>()) { : QWidget(parent), ui(std::make_unique<Ui::ConfigureWeb>()) {

2
src/yuzu/debugger/console.cpp
Unescape Escape View File

@ -10,7 +10,7 @@
#include "common/logging/backend.h" #include "common/logging/backend.h"
#include "yuzu/debugger/console.h" #include "yuzu/debugger/console.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
namespace Debugger { namespace Debugger {
void ToggleConsole() { void ToggleConsole() {

2
src/yuzu/game_list.cpp
Unescape Escape View File

@ -23,7 +23,7 @@
#include "yuzu/game_list_p.h" #include "yuzu/game_list_p.h"
#include "yuzu/game_list_worker.h" #include "yuzu/game_list_worker.h"
#include "yuzu/main.h" #include "yuzu/main.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
GameListSearchField::KeyReleaseEater::KeyReleaseEater(GameList* gamelist) : gamelist{gamelist} {} GameListSearchField::KeyReleaseEater::KeyReleaseEater(GameList* gamelist) : gamelist{gamelist} {}

2
src/yuzu/game_list_p.h
Unescape Escape View File

@ -19,7 +19,7 @@
#include "common/common_types.h" #include "common/common_types.h"
#include "common/logging/log.h" #include "common/logging/log.h"
#include "common/string_util.h" #include "common/string_util.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
#include "yuzu/util/util.h" #include "yuzu/util/util.h"
/** /**

2
src/yuzu/game_list_worker.cpp
Unescape Escape View File

@ -29,7 +29,7 @@
#include "yuzu/game_list.h" #include "yuzu/game_list.h"
#include "yuzu/game_list_p.h" #include "yuzu/game_list_p.h"
#include "yuzu/game_list_worker.h" #include "yuzu/game_list_worker.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
namespace { namespace {

2
src/yuzu/hotkeys.cpp
Unescape Escape View File

@ -7,7 +7,7 @@
#include <QTreeWidgetItem> #include <QTreeWidgetItem>
#include <QtGlobal> #include <QtGlobal>
#include "yuzu/hotkeys.h" #include "yuzu/hotkeys.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
HotkeyRegistry::HotkeyRegistry() = default; HotkeyRegistry::HotkeyRegistry() = default;
HotkeyRegistry::~HotkeyRegistry() = default; HotkeyRegistry::~HotkeyRegistry() = default;

2
src/yuzu/main.cpp
Unescape Escape View File

@ -100,7 +100,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual
#include "yuzu/hotkeys.h" #include "yuzu/hotkeys.h"
#include "yuzu/loading_screen.h" #include "yuzu/loading_screen.h"
#include "yuzu/main.h" #include "yuzu/main.h"
#include "yuzu/ui_settings.h" #include "yuzu/uisettings.h"
#ifdef USE_DISCORD_PRESENCE #ifdef USE_DISCORD_PRESENCE
#include "yuzu/discord_impl.h" #include "yuzu/discord_impl.h"

2
src/yuzu/ui_settings.cpp → src/yuzu/uisettings.cpp
Unescape Escape View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include "ui_settings.h" #include "yuzu/uisettings.h"
namespace UISettings { namespace UISettings {

0
src/yuzu/ui_settings.h → src/yuzu/uisettings.h
Unescape Escape View File