diff options
| author | 2018-12-28 19:29:44 -0500 | |
|---|---|---|
| committer | 2018-12-28 19:29:49 -0500 | |
| commit | 0c5ede492f8dd2e321bb237a56e7f38609541366 (patch) | |
| tree | bc00e6bb78b9b60050f26dd632c4171e54ea8407 | |
| parent | web_browser: Add bounds checking to applet interface (diff) | |
| download | yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.tar.gz yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.tar.xz yuzu-0c5ede492f8dd2e321bb237a56e7f38609541366.zip | |
travis: Use correct package for linux Qt5WebEngine
| -rwxr-xr-x | .travis/linux/docker.sh | 2 | ||||
| -rw-r--r-- | src/core/hle/service/hid/hid.h | 4 | ||||
| -rw-r--r-- | src/core/hle/service/nfp/nfp.cpp | 1 | ||||
| -rw-r--r-- | src/yuzu/main.cpp | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/.travis/linux/docker.sh b/.travis/linux/docker.sh index ec2cd0874..8b7e65911 100755 --- a/.travis/linux/docker.sh +++ b/.travis/linux/docker.sh | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/bin/bash -ex | 1 | #!/bin/bash -ex |
| 2 | 2 | ||
| 3 | apt-get update | 3 | apt-get update |
| 4 | apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev libqt5webengine5 wget cmake ninja-build ccache | 4 | apt-get install --no-install-recommends -y build-essential git libqt5opengl5-dev libsdl2-dev libssl-dev python qtbase5-dev qtwebengine5-dev wget cmake ninja-build ccache |
| 5 | 5 | ||
| 6 | cd /yuzu | 6 | cd /yuzu |
| 7 | 7 | ||
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h index 615d4e6d8..eca27c056 100644 --- a/src/core/hle/service/hid/hid.h +++ b/src/core/hle/service/hid/hid.h | |||
| @@ -3,6 +3,8 @@ | |||
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| 5 | #pragma once | 5 | #pragma once |
| 6 | |||
| 7 | #include "controllers/controller_base.h" | ||
| 6 | #include "core/hle/service/service.h" | 8 | #include "core/hle/service/service.h" |
| 7 | 9 | ||
| 8 | namespace CoreTiming { | 10 | namespace CoreTiming { |
| @@ -19,8 +21,6 @@ class ServiceManager; | |||
| 19 | 21 | ||
| 20 | namespace Service::HID { | 22 | namespace Service::HID { |
| 21 | 23 | ||
| 22 | class ControllerBase; | ||
| 23 | |||
| 24 | enum class HidController : std::size_t { | 24 | enum class HidController : std::size_t { |
| 25 | DebugPad, | 25 | DebugPad, |
| 26 | Touchscreen, | 26 | Touchscreen, |
diff --git a/src/core/hle/service/nfp/nfp.cpp b/src/core/hle/service/nfp/nfp.cpp index a7bed0040..9ca5461db 100644 --- a/src/core/hle/service/nfp/nfp.cpp +++ b/src/core/hle/service/nfp/nfp.cpp | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include "core/hle/kernel/readable_event.h" | 11 | #include "core/hle/kernel/readable_event.h" |
| 12 | #include "core/hle/kernel/writable_event.h" | 12 | #include "core/hle/kernel/writable_event.h" |
| 13 | #include "core/hle/lock.h" | 13 | #include "core/hle/lock.h" |
| 14 | #include "core/hle/service/hid/hid.h" | ||
| 15 | #include "core/hle/service/nfp/nfp.h" | 14 | #include "core/hle/service/nfp/nfp.h" |
| 16 | #include "core/hle/service/nfp/nfp_user.h" | 15 | #include "core/hle/service/nfp/nfp_user.h" |
| 17 | 16 | ||
diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 18dc93c95..4eb73792f 100644 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp | |||
| @@ -351,7 +351,7 @@ void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view | |||
| 351 | running_exit_check = true; | 351 | running_exit_check = true; |
| 352 | } | 352 | } |
| 353 | 353 | ||
| 354 | const auto input = npad.GetPressState(); | 354 | const auto input = npad.GetAndResetPressState(); |
| 355 | for (std::size_t i = 0; i < Settings::NativeButton::NumButtons; ++i) { | 355 | for (std::size_t i = 0; i < Settings::NativeButton::NumButtons; ++i) { |
| 356 | if ((input & (1 << i)) != 0) { | 356 | if ((input & (1 << i)) != 0) { |
| 357 | LOG_DEBUG(Frontend, "firing input for button id={:02X}", i); | 357 | LOG_DEBUG(Frontend, "firing input for button id={:02X}", i); |