summaryrefslogtreecommitdiff
path: root/src/yuzu/main.h
diff options
context:
space:
mode:
authorliamwhite <liamwhite@users.noreply.github.com>2023-05-16 10:06:15 -0400
committerGitHub <noreply@github.com>2023-05-16 10:06:15 -0400
commita540d248f3eca41544f685b5efb71165f0a050a2 (patch)
treecf2f104a368873ae57bf363239934173cd8f3113 /src/yuzu/main.h
parentbbb6b58aa4d86ccf1d23b5bdb3f81a50775848a1 (diff)
parentceb65c259a8aeb3e5aabe8a94235073c9e1e1c80 (diff)
Merge pull request #10107 from grimkor/allow-fully-customised-hotkeys
Allow fully customised controller hotkeys
Diffstat (limited to 'src/yuzu/main.h')
-rw-r--r--src/yuzu/main.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/yuzu/main.h b/src/yuzu/main.h
index 7b23f2a59..17631a2d9 100644
--- a/src/yuzu/main.h
+++ b/src/yuzu/main.h
@@ -214,7 +214,8 @@ public slots:
private:
/// Updates an action's shortcut and text to reflect an updated hotkey from the hotkey registry.
- void LinkActionShortcut(QAction* action, const QString& action_name);
+ void LinkActionShortcut(QAction* action, const QString& action_name,
+ const bool tas_allowed = false);
void RegisterMetaTypes();