dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set QNetworkRequest::RedirectPolicyAttribute with Qt >= 5.9

Browse Source
This commit is contained in:
Jonas Kvinge
2020-08-14 20:31:04 +02:00
parent 0788981783
commit d3664dcf78
3 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/covermanager/coverfromurldialog.cpp
View File

@@ -65,9 +65,14 @@ void CoverFromURLDialog::accept() {
ui_->busy->show(); ui_->busy->show();
QNetworkRequest network_request = QNetworkRequest(QUrl::fromUserInput(ui_->url->text())); QNetworkRequest req(QUrl::fromUserInput(ui_->url->text()));
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
#else
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
QNetworkReply *reply = network_->get(network_request); QNetworkReply *reply = network_->get(req);
connect(reply, SIGNAL(finished()), SLOT(LoadCoverFromURLFinished())); connect(reply, SIGNAL(finished()), SLOT(LoadCoverFromURLFinished()));
} }

2
src/lyrics/geniuslyricsprovider.cpp
View File

@@ -189,7 +189,7 @@ void GeniusLyricsProvider::RequestAccessToken(const QUrl &url, const QUrl &redir
} }
QUrl new_url(kOAuthAccessTokenUrl); QUrl new_url(kOAuthAccessTokenUrl);
QNetworkRequest req = QNetworkRequest(new_url); QNetworkRequest req(new_url);
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0) #if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy); req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
#else #else

9
src/tidal/tidalservice.cpp
View File

@@ -389,11 +389,16 @@ void TidalService::RequestAccessToken(const QString &code) {
} }
QUrl url(kOAuthAccessTokenUrl); QUrl url(kOAuthAccessTokenUrl);
QNetworkRequest request = QNetworkRequest(url); QNetworkRequest req(url);
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
#else
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
QByteArray query = url_query.toString(QUrl::FullyEncoded).toUtf8(); QByteArray query = url_query.toString(QUrl::FullyEncoded).toUtf8();
login_errors_.clear(); login_errors_.clear();
QNetworkReply *reply = network_->post(request, query); QNetworkReply *reply = network_->post(req, query);
replies_ << reply; replies_ << reply;
connect(reply, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(HandleLoginSSLErrors(QList<QSslError>))); connect(reply, SIGNAL(sslErrors(QList<QSslError>)), this, SLOT(HandleLoginSSLErrors(QList<QSslError>)));
connect(reply, &QNetworkReply::finished, [=] { AccessTokenRequestFinished(reply); }); connect(reply, &QNetworkReply::finished, [=] { AccessTokenRequestFinished(reply); });