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

Require Qt 5.9

Browse Source
This commit is contained in:
Jonas Kvinge
2022-01-29 21:33:33 +01:00
parent fd5970b647
commit 63e5d6a94a
36 changed files with 3 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/subsonic/subsonicbaserequest.cpp
View File

@@ -51,9 +51,7 @@ SubsonicBaseRequest::SubsonicBaseRequest(SubsonicService *service, QObject *pare
service_(service),
network_(new QNetworkAccessManager) {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
network_->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
#endif
}
@@ -109,11 +107,7 @@ QNetworkReply *SubsonicBaseRequest::CreateGetRequest(const QString &ressource_na
}
req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
#else
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
req.setAttribute(QNetworkRequest::Http2AllowedAttribute, http2());

6
src/subsonic/subsonicrequest.cpp
View File

@@ -75,9 +75,7 @@ SubsonicRequest::SubsonicRequest(SubsonicService *service, SubsonicUrlHandler *u
album_covers_received_(0),
no_results_(false) {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
network_->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
#endif
}
@@ -732,11 +730,7 @@ void SubsonicRequest::FlushAlbumCoverRequests() {
++album_covers_requests_active_;
QNetworkRequest req(request.url);
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
#else
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)
req.setAttribute(QNetworkRequest::Http2AllowedAttribute, http2());

7
src/subsonic/subsonicservice.cpp
View File

@@ -154,9 +154,7 @@ void SubsonicService::SendPingWithCredentials(QUrl url, const QString &username,
if (!network_ || !redirect) {
network_ = std::make_unique<QNetworkAccessManager>();
#if (QT_VERSION >= QT_VERSION_CHECK(5, 9, 0))
network_->setRedirectPolicy(QNetworkRequest::NoLessSafeRedirectPolicy);
#endif
ping_redirects_ = 0;
}
@@ -201,12 +199,7 @@ void SubsonicService::SendPingWithCredentials(QUrl url, const QString &username,
req.setSslConfiguration(sslconfig);
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
#else
req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif
req.setHeader(QNetworkRequest::ContentTypeHeader, "application/x-www-form-urlencoded");
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 0)