diff options
| author |  Vishal Sharma | 2018-02-27 10:33:03 +0530 |
|---|---|---|
| committer |  bunnei | 2018-02-26 21:03:02 -0800 |
| commit | 65f3119074f4cb6a07af747b9c9d8445e08ccc50 (patch) | |
| tree | bd5679594c88db819152568af15f0696d0d40f60 /src | |
| parent | Merge pull request #207 from mailwl/duplicatesession (diff) | |
| download | yuzu-65f3119074f4cb6a07af747b9c9d8445e08ccc50.tar.gz yuzu-65f3119074f4cb6a07af747b9c9d8445e08ccc50.tar.xz yuzu-65f3119074f4cb6a07af747b9c9d8445e08ccc50.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/yuzu/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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() { | |||
| 187 | RegisterHotkey("Main Window", "Load File", QKeySequence::Open); | 187 | RegisterHotkey("Main Window", "Load File", QKeySequence::Open); |
| 188 | RegisterHotkey("Main Window", "Start Emulation"); | 188 | RegisterHotkey("Main Window", "Start Emulation"); |
| 189 | RegisterHotkey("Main Window", "Fullscreen", QKeySequence::FullScreen); | 189 | RegisterHotkey("Main Window", "Fullscreen", QKeySequence::FullScreen); |
| 190 | RegisterHotkey("Main Window", "Exit Fullscreen", QKeySequence::Cancel, Qt::ApplicationShortcut); | 190 | RegisterHotkey("Main Window", "Exit Fullscreen", QKeySequence(Qt::Key_Escape), |
| 191 | Qt::ApplicationShortcut); | ||
| 191 | LoadHotkeys(); | 192 | LoadHotkeys(); |
| 192 | 193 | ||
| 193 | connect(GetHotkey("Main Window", "Load File", this), &QShortcut::activated, this, | 194 | connect(GetHotkey("Main Window", "Load File", this), &QShortcut::activated, this, |