Merge PR 11889

2023-11-16 00:57:11 +00:00
parent fd29b3c8ff
commit fba39603c5
69 changed files with 2613 additions and 3540 deletions
--- a/src/yuzu/configuration/configure_touchscreen_advanced.cpp
+++ b/src/yuzu/configuration/configure_touchscreen_advanced.cpp
@ -2,8 +2,8 @@
 // SPDX-License-Identifier: GPL-2.0-or-later

 #include <memory>
+#include "common/settings.h"
 #include "ui_configure_touchscreen_advanced.h"
-#include "yuzu/configuration/config.h"
 #include "yuzu/configuration/configure_touchscreen_advanced.h"

 ConfigureTouchscreenAdvanced::ConfigureTouchscreenAdvanced(QWidget* parent)