Explorar o código

travis: Use correct package for linux Qt5WebEngine

Zach Hilman %!s(int64=7) %!d(string=hai) anos
pai
achega
0c5ede492f

+ 1 - 1
.travis/linux/docker.sh

@@ -1,7 +1,7 @@
 #!/bin/bash -ex
 
 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
 

+ 2 - 2
src/core/hle/service/hid/hid.h

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

+ 0 - 1
src/core/hle/service/nfp/nfp.cpp

@@ -11,7 +11,6 @@
 #include "core/hle/kernel/readable_event.h"
 #include "core/hle/kernel/writable_event.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_user.h"
 

+ 1 - 1
src/yuzu/main.cpp

@@ -351,7 +351,7 @@ void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view
             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) {
             if ((input & (1 << i)) != 0) {
                 LOG_DEBUG(Frontend, "firing input for button id={:02X}", i);