Merge PR 11889

2023-11-17 00:57:10 +00:00
parent d695cf1676
commit 13f37654c2
69 changed files with 2614 additions and 3541 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)