diff options
-rw-r--r-- | src/gui/connectionvalidator.cpp | 2 | ||||
-rw-r--r-- | src/gui/folderstatusdelegate.cpp | 2 | ||||
-rw-r--r-- | src/libsync/abstractnetworkjob.cpp | 2 | ||||
-rw-r--r-- | src/libsync/accessmanager.cpp | 2 | ||||
-rw-r--r-- | src/libsync/iconjob.cpp | 2 | ||||
-rw-r--r-- | src/libsync/propagatedownload.cpp | 2 | ||||
-rw-r--r-- | test/testdownload.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/connectionvalidator.cpp b/src/gui/connectionvalidator.cpp index 14bc2617c..1fd296315 100644 --- a/src/gui/connectionvalidator.cpp +++ b/src/gui/connectionvalidator.cpp @@ -278,7 +278,7 @@ bool ConnectionValidator::setAndCheckServerVersion(const QString &version) if (auto job = qobject_cast<AbstractNetworkJob *>(sender())) { if (auto reply = job->reply()) { _account->setHttp2Supported( - reply->attribute(QNetworkRequest::HTTP2WasUsedAttribute).toBool()); + reply->attribute(QNetworkRequest::Http2WasUsedAttribute).toBool()); } } #endif diff --git a/src/gui/folderstatusdelegate.cpp b/src/gui/folderstatusdelegate.cpp index ed08bf9e2..ed5b222f4 100644 --- a/src/gui/folderstatusdelegate.cpp +++ b/src/gui/folderstatusdelegate.cpp @@ -400,7 +400,7 @@ QRect FolderStatusDelegate::optionsButtonRect(QRect within, Qt::LayoutDirection opt.rect.setSize(QSize(e,e)); QSize size = QApplication::style()->sizeFromContents(QStyle::CT_ToolButton, &opt, opt.rect.size()).expandedTo(QApplication::globalStrut()); - int margin = QApplication::style()->pixelMetric(QStyle::PM_DefaultLayoutSpacing); + int margin = QApplication::style()->pixelMetric(QStyle::PM_LayoutHorizontalSpacing); QRect r(QPoint(within.right() - size.width() - margin, within.top() + within.height() / 2 - size.height() / 2), size); diff --git a/src/libsync/abstractnetworkjob.cpp b/src/libsync/abstractnetworkjob.cpp index feac00601..ef2dc75f4 100644 --- a/src/libsync/abstractnetworkjob.cpp +++ b/src/libsync/abstractnetworkjob.cpp @@ -188,7 +188,7 @@ void AbstractNetworkJob::slotFinished() const auto maxHttp2Resends = 3; QByteArray verb = HttpLogger::requestVerb(*reply()); if (_reply->error() == QNetworkReply::ContentReSendError - && _reply->attribute(QNetworkRequest::HTTP2WasUsedAttribute).toBool()) { + && _reply->attribute(QNetworkRequest::Http2WasUsedAttribute).toBool()) { if ((_requestBody && !_requestBody->isSequential()) || verb.isEmpty()) { qCWarning(lcNetworkJob) << "Can't resend HTTP2 request, verb or body not suitable" diff --git a/src/libsync/accessmanager.cpp b/src/libsync/accessmanager.cpp index fa04e6c6b..00b08d3f5 100644 --- a/src/libsync/accessmanager.cpp +++ b/src/libsync/accessmanager.cpp @@ -84,7 +84,7 @@ QNetworkReply *AccessManager::createRequest(QNetworkAccessManager::Operation op, // http2 seems to cause issues, as with our recommended server setup we don't support http2, disable it by default for now static const bool http2EnabledEnv = qEnvironmentVariableIntValue("OWNCLOUD_HTTP2_ENABLED") == 1; - newRequest.setAttribute(QNetworkRequest::HTTP2AllowedAttribute, http2EnabledEnv); + newRequest.setAttribute(QNetworkRequest::Http2AllowedAttribute, http2EnabledEnv); } #endif diff --git a/src/libsync/iconjob.cpp b/src/libsync/iconjob.cpp index 23a7ace7f..68263fc67 100644 --- a/src/libsync/iconjob.cpp +++ b/src/libsync/iconjob.cpp @@ -21,7 +21,7 @@ IconJob::IconJob(AccountPtr account, const QUrl &url, QObject *parent) { QNetworkRequest request(url); #if (QT_VERSION >= 0x050600) - request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); + request.setAttribute(QNetworkRequest::RedirectPolicyAttribute, true); #endif const auto reply = account->sendRawRequest(QByteArrayLiteral("GET"), url, request); connect(reply, &QNetworkReply::finished, this, &IconJob::finished); diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp index 1474d3f88..088ce7289 100644 --- a/src/libsync/propagatedownload.cpp +++ b/src/libsync/propagatedownload.cpp @@ -865,7 +865,7 @@ void PropagateDownloadFile::slotGetFinished() // of the compressed data. See QTBUG-73364. const auto contentEncoding = job->reply()->rawHeader("content-encoding").toLower(); if ((contentEncoding == "gzip" || contentEncoding == "deflate") - && (job->reply()->attribute(QNetworkRequest::HTTP2WasUsedAttribute).toBool() + && (job->reply()->attribute(QNetworkRequest::Http2WasUsedAttribute).toBool() || job->reply()->attribute(QNetworkRequest::SpdyWasUsedAttribute).toBool())) { bodySize = 0; hasSizeHeader = false; diff --git a/test/testdownload.cpp b/test/testdownload.cpp index 80d85e4bd..f534f1a1e 100644 --- a/test/testdownload.cpp +++ b/test/testdownload.cpp @@ -220,7 +220,7 @@ private slots: if (op == QNetworkAccessManager::GetOperation && request.url().path().endsWith("A/resendme") && resendActual < resendExpected) { auto errorReply = new FakeErrorReply(op, request, this, 400, "ignore this body"); errorReply->setError(QNetworkReply::ContentReSendError, serverMessage); - errorReply->setAttribute(QNetworkRequest::HTTP2WasUsedAttribute, true); + errorReply->setAttribute(QNetworkRequest::Http2WasUsedAttribute, true); errorReply->setAttribute(QNetworkRequest::HttpStatusCodeAttribute, QVariant()); resendActual += 1; return errorReply; |