moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-16 21:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build on Qt 5.15 Beta 2

Browse Source 
Reverts most of 10dae7482c
This commit is contained in:
Cameron Gutman
2020-03-23 18:30:56 -07:00
parent e9f766904e
commit 6c980eba68
6 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/backend/autoupdatechecker.cpp
+2 -3
View File
@@ -1,5 +1,4 @@
#include "autoupdatechecker.h"
#include "utils.h"
#include <QNetworkReply>
#include <QJsonDocument>
@@ -62,7 +61,7 @@ void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
{
Q_ASSERT(reply->isFinished());
if (QNETREPLY_GET_ERROR(reply) == QNetworkReply::NoError) {
if (reply->error() == QNetworkReply::NoError) {
QTextStream stream(reply);
stream.setCodec("UTF-8");
@@ -155,7 +154,7 @@ void AutoUpdateChecker::handleUpdateCheckRequestFinished(QNetworkReply* reply)
<< QSysInfo::buildCpuArchitecture() << getPlatform();
}
else {
qWarning() << "Update checking failed with error: " << QNETREPLY_GET_ERROR(reply);
qWarning() << "Update checking failed with error: " << reply->error();
reply->deleteLater();
}
}
app/backend/nvcomputer.cpp
+1 -2
View File
@@ -1,5 +1,4 @@
#include "nvcomputer.h"
#include "utils.h"
#include <QUdpSocket>
#include <QHostInfo>
@@ -230,7 +229,7 @@ bool NvComputer::wake()
success = true;
}
else {
qWarning() << "Send failed:" << QSOCK_GET_ERROR(&sock);
qWarning() << "Send failed:" << sock.error();
}
}
}
app/backend/nvhttp.cpp
+5 -6
View File
@@ -1,5 +1,4 @@
#include "nvhttp.h"
#include "utils.h"
#include <Limelight.h>
#include <QDebug>
@@ -489,26 +488,26 @@ NvHTTP::openConnection(QUrl baseUrl,
m_Nam.clearAccessCache();
// Handle error
if (QNETREPLY_GET_ERROR(reply) != QNetworkReply::NoError)
if (reply->error() != QNetworkReply::NoError)
{
if (logLevel >= NvLogLevel::NVLL_ERROR) {
qWarning() << command << " request failed with error " << QNETREPLY_GET_ERROR(reply);
qWarning() << command << " request failed with error " << reply->error();
}
if (QNETREPLY_GET_ERROR(reply) == QNetworkReply::SslHandshakeFailedError) {
if (reply->error() == QNetworkReply::SslHandshakeFailedError) {
// This will trigger falling back to HTTP for the serverinfo query
// then pairing again to get the updated certificate.
GfeHttpResponseException exception(401, "Server certificate mismatch");
delete reply;
throw exception;
}
else if (QNETREPLY_GET_ERROR(reply) == QNetworkReply::OperationCanceledError) {
else if (reply->error() == QNetworkReply::OperationCanceledError) {
QtNetworkReplyException exception(QNetworkReply::TimeoutError, "Request timed out");
delete reply;
throw exception;
}
else {
QtNetworkReplyException exception(QNETREPLY_GET_ERROR(reply), reply->errorString());
QtNetworkReplyException exception(reply->error(), reply->errorString());
delete reply;
throw exception;
}