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/configure_general.ui | |
| 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/configure_general.ui')
| -rw-r--r-- | src/yuzu/configuration/configure_general.ui | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/src/yuzu/configuration/configure_general.ui b/src/yuzu/configuration/configure_general.ui index 01d1c0b8e..1a5721fe7 100644 --- a/src/yuzu/configuration/configure_general.ui +++ b/src/yuzu/configuration/configure_general.ui @@ -98,22 +98,6 @@ </widget> </item> <item> - <widget class="QGroupBox" name="HotKeysGroupBox"> - <property name="title"> - <string>Hotkeys</string> - </property> - <layout class="QHBoxLayout" name="HotKeysHorizontalLayout"> - <item> - <layout class="QVBoxLayout" name="HotKeysVerticalLayout"> - <item> - <widget class="GHotkeysDialog" name="widget" native="true"/> - </item> - </layout> - </item> - </layout> - </widget> - </item> - <item> <spacer name="verticalSpacer"> <property name="orientation"> <enum>Qt::Vertical</enum> @@ -130,14 +114,6 @@ </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>GHotkeysDialog</class> - <extends>QWidget</extends> - <header>hotkeys.h</header> - <container>1</container> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> |