CCF_100
/
yuzu-mirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

travis: Use correct package for linux Qt5WebEngine

master
Zach Hilman 2018-12-28 19:29:44 +07:00
parent cb930c4b5a
commit 0c5ede492f
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis/linux/docker.sh
Unescape Escape View File

@ -1,7 +1,7 @@
#!/bin/bash -ex #!/bin/bash -ex
apt-get update apt-get update
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 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
cd /yuzu cd /yuzu

4
src/core/hle/service/hid/hid.h
Unescape Escape View File

@ -3,6 +3,8 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#pragma once #pragma once
#include "controllers/controller_base.h"
#include "core/hle/service/service.h" #include "core/hle/service/service.h"
namespace CoreTiming { namespace CoreTiming {
@ -19,8 +21,6 @@ class ServiceManager;
namespace Service::HID { namespace Service::HID {
class ControllerBase;
enum class HidController : std::size_t { enum class HidController : std::size_t {
DebugPad, DebugPad,
Touchscreen, Touchscreen,

1
src/core/hle/service/nfp/nfp.cpp
Unescape Escape View File

@ -11,7 +11,6 @@
#include "core/hle/kernel/readable_event.h" #include "core/hle/kernel/readable_event.h"
#include "core/hle/kernel/writable_event.h" #include "core/hle/kernel/writable_event.h"
#include "core/hle/lock.h" #include "core/hle/lock.h"
#include "core/hle/service/hid/hid.h"
#include "core/hle/service/nfp/nfp.h" #include "core/hle/service/nfp/nfp.h"
#include "core/hle/service/nfp/nfp_user.h" #include "core/hle/service/nfp/nfp_user.h"

2
src/yuzu/main.cpp
Unescape Escape View File

@ -351,7 +351,7 @@ void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view
running_exit_check = true; running_exit_check = true;
} }
const auto input = npad.GetPressState(); const auto input = npad.GetAndResetPressState();
for (std::size_t i = 0; i < Settings::NativeButton::NumButtons; ++i) { for (std::size_t i = 0; i < Settings::NativeButton::NumButtons; ++i) {
if ((input & (1 << i)) != 0) { if ((input & (1 << i)) != 0) {
LOG_DEBUG(Frontend, "firing input for button id={:02X}", i); LOG_DEBUG(Frontend, "firing input for button id={:02X}", i);