citra/citra-nightly
1
0
Fork 0
mirror of https://github.com/citra-emu/citra-nightly.git synced 2024-12-27 12:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

citra_qt: Remove use of QKeySequence::Cancel

Browse source 
Closes #3023. QKeySequence::Cancel requires Qt 5.6, which our buildbots do not support.
This commit is contained in:
MerryMage 2017-10-21 23:40:20 +01:00
parent dcb48840c3
commit 1e4bd67a12
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/citra_qt/main.cpp
View file

@ -245,7 +245,8 @@ void GMainWindow::InitializeHotkeys() {
RegisterHotkey("Main Window", "Swap Screens", QKeySequence::NextChild);
RegisterHotkey("Main Window", "Start Emulation");
RegisterHotkey("Main Window", "Fullscreen", QKeySequence::FullScreen);
RegisterHotkey("Main Window", "Exit Fullscreen", QKeySequence::Cancel, Qt::ApplicationShortcut);
RegisterHotkey("Main Window", "Exit Fullscreen", QKeySequence(Qt::Key_Escape),
Qt::ApplicationShortcut);
LoadHotkeys();
connect(GetHotkey("Main Window", "Load File", this), SIGNAL(activated()), this,