diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-07-29 16:06:33 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-08-09 17:54:08 -0400 |
| commit | 5980aa1e51edf2261746acf10f7d9be0406caaed (patch) | |
| tree | b7434dd840f27b655631565fec62e78243fceec8 /src/yuzu/configuration/config.cpp | |
| parent | f601f25bcc76f54ac0fa983cd74141bb075468de (diff) | |
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.
Diffstat (limited to 'src/yuzu/configuration/config.cpp')
| -rw-r--r-- | src/yuzu/configuration/config.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp index b7f3fdf75d..5d0fb3f9f2 100644 --- a/src/yuzu/configuration/config.cpp +++ b/src/yuzu/configuration/config.cpp @@ -11,7 +11,7 @@ #include "core/hle/service/hid/controllers/npad.h" #include "input_common/main.h" #include "yuzu/configuration/config.h" -#include "yuzu/ui_settings.h" +#include "yuzu/uisettings.h" Config::Config() { // TODO: Don't hardcode the path; let the frontend decide where to put the config files. |