diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-03-21 01:51:07 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-05-19 22:39:23 +0200 |
| commit | 3a746fa382053a6523db2a67a4bda76a4c481e79 (patch) | |
| tree | 9de1c824313878d99f1947de0d73efb7090d3b27 /src/network | |
| parent | 4d60dd91e0ac83f74a814f0cd6ffc03aa534879f (diff) | |
Remove all workarounds for Qt <5.9.0
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/jsonwebtask.cpp | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/src/network/jsonwebtask.cpp b/src/network/jsonwebtask.cpp index 1dd6540199..6a9efdfccf 100644 --- a/src/network/jsonwebtask.cpp +++ b/src/network/jsonwebtask.cpp @@ -1,8 +1,5 @@ #include "network/jsonwebtask.h" -#if QT_VERSION < QT_VERSION_CHECK(5, 8, 0) -#include <QBuffer> -#endif #include <QMetaMethod> #include <QMimeDatabase> #include <QNetworkRequest> @@ -10,10 +7,6 @@ #include <QTimerEvent> #include <mutex> // std::once_flag -#include "util/assert.h" -#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) -#include "util/compatibility.h" -#endif #include "util/counter.h" #include "util/logger.h" @@ -100,9 +93,7 @@ QNetworkRequest newRequest( const QUrl& url) { QNetworkRequest request(url); request.setHeader(QNetworkRequest::ContentTypeHeader, JSON_CONTENT_TYPE); -#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); -#endif return request; } @@ -207,19 +198,10 @@ QNetworkReply* JsonWebTask::sendNetworkRequest( << url << body; } -#if QT_VERSION >= QT_VERSION_CHECK(5, 8, 0) return networkAccessManager->sendCustomRequest( newRequest(url), "PATCH", body); -#else - auto* buffer = new QBuffer(this); - buffer->setData(body); - return networkAccessManager->sendCustomRequest( - newRequest(url), - "PATCH", - buffer); -#endif } case HttpRequestMethod::Delete: { DEBUG_ASSERT(content.isEmpty()); @@ -274,11 +256,7 @@ bool JsonWebTask::doStart( Qt::UniqueConnection); connect(m_pendingNetworkReply, -#if QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) qOverload<QNetworkReply::NetworkError>(&QNetworkReply::error), -#else - QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), -#endif this, &JsonWebTask::slotNetworkReplyFinished, Qt::UniqueConnection); |