diff options
| author | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-01-14 16:28:32 +0100 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2020-01-15 17:29:52 +0100 |
| commit | e263fec484d23fc2e652f538f39934b5364339e1 (patch) | |
| tree | 6b8bd2d300e687614be62e83cd153a733991b07a | |
| parent | b45d63e028345956256740307f2788b387188e1f (diff) | |
| download | qtxmlpatterns-e263fec484d23fc2e652f538f39934b5364339e1.tar.gz | |
Use QNetworkReply::networkError() instead of deprecated error()
Task-number: QTBUG-80369
Change-Id: I6e71a6b888f292c283c85b6aeb3aa5804f032c91
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 053e16a..494a007 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->error() != QNetworkReply::NoError) { + if (d->reply->networkError() != QNetworkReply::NoError) { d->errorString = d->reply->errorString(); d->deleteReply(); diff --git a/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp b/src/xmlpatterns/acceltree/qacceltreeresourceloader.cpp index e25a9b6..b41f80f 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->error() != QNetworkReply::NoError) { + if (reply->networkError() != QNetworkReply::NoError) { const QString errorMessage(escape(reply->errorString())); /* Note, we delete reply before we exit this function with error(). */ |