diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-02-24 16:04:00 +0000 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-02-24 16:16:29 +0000 |
| commit | ed2cca99b6c03cf17e219b72ba6d1488da4d594b (patch) | |
| tree | 616f60bf7ab31bb91accd2a996ce2ffeb20bdd52 | |
| parent | 2dfdd4f0bdd6647c104470712f0e463021488e43 (diff) | |
| download | qtxmlpatterns-ed2cca99b6c03cf17e219b72ba6d1488da4d594b.tar.gz | |
Revert "Use QNetworkReply::networkError() instead of deprecated error()"
This reverts commit e263fec484d23fc2e652f538f39934b5364339e1.
Naming in QProcess is considered to be the correct one.
Change-Id: Ie417b5b0b83f2d5ba4ace1a07d5fd4d5b41233ff
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| -rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 2 | ||||
| -rw-r--r-- | 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(). */ |