From 1e4bd67a1201ff055575ddbbf3876acc21652317 Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sat, 21 Oct 2017 23:40:20 +0100 Subject: [PATCH 1/2] citra_qt: Remove use of QKeySequence::Cancel Closes #3023. QKeySequence::Cancel requires Qt 5.6, which our buildbots do not support. --- src/citra_qt/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 3946bb153..e0de66e02 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -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, From 45fdcdd63201be87e5d388f21864938cecb8fc7a Mon Sep 17 00:00:00 2001 From: MerryMage Date: Sat, 21 Oct 2017 23:41:25 +0100 Subject: [PATCH 2/2] travis: An error in docker.sh should not result in success Closes #3022. --- .travis/linux/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/linux/build.sh b/.travis/linux/build.sh index 98433d184..14deaf31c 100755 --- a/.travis/linux/build.sh +++ b/.travis/linux/build.sh @@ -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