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/main.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/main.cpp')
| -rw-r--r-- | src/yuzu/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index ae21f47535..f9c1c5e463 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -100,7 +100,7 @@ static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::Virtual #include "yuzu/hotkeys.h" #include "yuzu/loading_screen.h" #include "yuzu/main.h" -#include "yuzu/ui_settings.h" +#include "yuzu/uisettings.h" #ifdef USE_DISCORD_PRESENCE #include "yuzu/discord_impl.h" |