ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Attempt to fix 5.8 build

This commit is contained in:
Vicki Pfau 2022-12-07 02:35:08 -08:00
parent e9ec009836
commit b220c7a68b
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/platform/qt/ForwarderController.cpp
View File

@ -180,6 +180,9 @@ void ForwarderController::downloadBuild(const QUrl& url) {
connectReply(reply, BASE, &ForwarderController::gotBuild); connectReply(reply, BASE, &ForwarderController::gotBuild);
connect(reply, &QNetworkReply::readyRead, this, [this, reply]() { connect(reply, &QNetworkReply::readyRead, this, [this, reply]() {
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() / 100 != 2) {
return;
}
QByteArray data = reply->readAll(); QByteArray data = reply->readAll();
m_sourceFile.write(data); m_sourceFile.write(data);
}); });
@ -236,8 +239,13 @@ void ForwarderController::connectReply(QNetworkReply* reply, Download download,
emit buildFailed(); emit buildFailed();
}); });
connect(reply, &QNetworkReply::finished, this, [this, reply, next]() { connect(reply, &QNetworkReply::finished, this, [this, reply, download, next]() {
if (reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() / 100 == 3) {
QNetworkReply* newReply = GBAApp::app()->httpGet(reply->header(QNetworkRequest::LocationHeader).toString());
connectReply(newReply, download, next);
} else {
(this->*next)(reply); (this->*next)(reply);
}
}); });
connect(reply, &QNetworkReply::downloadProgress, this, [this, download](qint64 bytesReceived, qint64 bytesTotal) { connect(reply, &QNetworkReply::downloadProgress, this, [this, download](qint64 bytesReceived, qint64 bytesTotal) {
emit downloadProgress(download, bytesReceived, bytesTotal); emit downloadProgress(download, bytesReceived, bytesTotal);

2
src/platform/qt/GBAApp.cpp
View File

@ -82,7 +82,9 @@ GBAApp::GBAApp(int& argc, char* argv[], ConfigController* config)
m_configController->updateOption("useDiscordPresence"); m_configController->updateOption("useDiscordPresence");
#endif #endif
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
m_netman.setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy); m_netman.setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
#endif
cleanupAfterUpdate(); cleanupAfterUpdate();