Merge pull request #3028 from MerryMage/fix-3023
citra_qt: Remove use of QKeySequence::Cancel
This commit is contained in:
commit
b4c1c26511
|
@ -1,3 +1,3 @@
|
|||
#!/bin/bash -ex
|
||||
|
||||
docker run -v $(pwd):/citra ubuntu:16.04 /bin/bash /citra/.travis/linux/docker.sh
|
||||
docker run -v $(pwd):/citra ubuntu:16.04 /bin/bash -ex /citra/.travis/linux/docker.sh
|
||||
|
|
|
@ -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,
|
||||
|
|
Reference in New Issue