From ed2cca99b6c03cf17e219b72ba6d1488da4d594b Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Mon, 24 Feb 2020 16:04:00 +0000 Subject: Revert "Use QNetworkReply::networkError() instead of deprecated error()" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e263fec484d23fc2e652f538f39934b5364339e1. Naming in QProcess is considered to be the correct one. Change-Id: Ie417b5b0b83f2d5ba4ace1a07d5fd4d5b41233ff Reviewed-by: Mårten Nordheim Reviewed-by: Friedemann Kleint --- src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 2 +- src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index 516254e..2b65b2b 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -1107,7 +1107,7 @@ void QQuickXmlListModel::requestFinished() } d->redirectCount = 0; - if (d->reply->networkError() != QNetworkReply::NoError) { + if (d->reply->error() != QNetworkReply::NoError) { d->errorString = d->reply->errorString(); d->deleteReply(); diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp index b41f80f..e25a9b6 100644 --- a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp +++ b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp @@ -129,7 +129,7 @@ QNetworkReply *AccelTreeResourceLoader::load(const QUrl &uri, ftpNetworkLoop.exec(QEventLoop::ExcludeUserInputEvents); } - if (reply->networkError() != QNetworkReply::NoError) { + if (reply->error() != QNetworkReply::NoError) { const QString errorMessage(escape(reply->errorString())); /* Note, we delete reply before we exit this function with error(). */ -- cgit v1.2.1