diff options
| author | bunnei <bunneidev@gmail.com> | 2019-04-09 18:08:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 18:08:30 -0400 |
| commit | 1a3098f11a21bd102c63f2bc4ebb01789d3fd93e (patch) | |
| tree | 8f977d1f87ff108edaf285ee1569cdff64d747d2 /src/yuzu/configuration/config.h | |
| parent | 71182643f76a136d755698f0eb7efef5f7d5d6cc (diff) | |
| parent | 57a4a2ae0fc35906723ffc9f788f3cf7dd9c4ba5 (diff) | |
Merge pull request #2132 from FearlessTobi/port-4437
Port citra-emu/citra#4437: "citra-qt: Make hotkeys configurable via the GUI (Attempt 2)"
Diffstat (limited to 'src/yuzu/configuration/config.h')
| -rw-r--r-- | src/yuzu/configuration/config.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/yuzu/configuration/config.h b/src/yuzu/configuration/config.h index f4185db18..221d2364c 100644 --- a/src/yuzu/configuration/config.h +++ b/src/yuzu/configuration/config.h @@ -9,6 +9,7 @@ #include <string> #include <QVariant> #include "core/settings.h" +#include "yuzu/ui_settings.h" class QSettings; @@ -47,6 +48,8 @@ private: void WriteSetting(const QString& name, const QVariant& value); void WriteSetting(const QString& name, const QVariant& value, const QVariant& default_value); + static const std::array<UISettings::Shortcut, 15> default_hotkeys; + std::unique_ptr<QSettings> qt_config; std::string qt_config_loc; }; |