From 65f3119074f4cb6a07af747b9c9d8445e08ccc50 Mon Sep 17 00:00:00 2001 From: Vishal Sharma Date: Tue, 27 Feb 2018 10:33:03 +0530 Subject: Removes the use of QKeySequence::Cancel (#186) * Removes the use of QKeySequence::Cancel to remove issues while running make * Corrects characters in a line for travis failure * Corrects space in a line for travis failure --- src/yuzu/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index e5252abdc..5802b9855 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -187,7 +187,8 @@ void GMainWindow::InitializeHotkeys() { RegisterHotkey("Main Window", "Load File", QKeySequence::Open); 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), &QShortcut::activated, this, -- cgit v1.2.3