Revert "error -> networkError to fix deprecation warning"

This reverts commit 391bd68b4045268b389780f4b08d2f07951b45bf.

Reason for revert: this warning is only temporary, the patch fixing it
- is  coming. But the original change of error->networkError
was reverted in 5.15 to make the new patch, changing signal name instead,
work. Now qtdeclarative does not compile - it calls non-existing function.

Change-Id: I276562564c8954f67dcdf4fd5d08afd5f3f9dc8b
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

2 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp
index 64ca719e29..92face6f94 100644
--- a/src/qml/jsruntime/qv4include.cpp
+++ b/src/qml/jsruntime/qv4include.cpp
@@ -163,7 +163,7 @@ void QV4Include::finished()
     QV4::Scope scope(v4);
     QV4::ScopedObject resultObj(scope, m_resultObject.value());
     QV4::ScopedString status(scope, v4->newString(QStringLiteral("status")));
-    if (m_reply->networkError() == QNetworkReply::NoError) {
+    if (m_reply->error() == QNetworkReply::NoError) {
         QByteArray data = m_reply->readAll();
 
         QString code = QString::fromUtf8(data);
diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
index f910fe1140..13ad22126f 100644
--- a/src/qml/qml/qqmltypeloader.cpp
+++ b/src/qml/qml/qqmltypeloader.cpp
@@ -357,8 +357,8 @@ void QQmlTypeLoader::networkReplyFinished(QNetworkReply *reply)
         }
     }
 
-    if (reply->networkError()) {
-        blob->networkError(reply->networkError());
+    if (reply->error()) {
+        blob->networkError(reply->error());
     } else {
         QByteArray data = reply->readAll();
         setData(blob, data);