Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I99ee6f8b4bdc372437ee60d1feab931487fe55c4

1 files changed, 13 insertions, 2 deletions

diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index fb30bfd4f18..22c522756c5 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -91,7 +91,7 @@ QNetworkReplyPrivate::QNetworkReplyPrivate()
     content.
 
     \note Do not delete the object in the slot connected to the
-    error() or finished() signal. Use deleteLater().
+    errorOccurred() or finished() signal. Use deleteLater().
 
     \sa QNetworkRequest, QNetworkAccessManager
 */
@@ -219,6 +219,7 @@ QNetworkReplyPrivate::QNetworkReplyPrivate()
     the server response was detected
 
     \sa error()
+    \sa errorOccurred()
 */
 
 /*!
@@ -362,6 +363,14 @@ QNetworkReplyPrivate::QNetworkReplyPrivate()
 
 /*!
     \fn void QNetworkReply::error(QNetworkReply::NetworkError code)
+    \obsolete
+
+    Use errorOccurred() instead.
+*/
+
+/*!
+    \fn void QNetworkReply::errorOccurred(QNetworkReply::NetworkError code)
+    \since 5.15
 
     This signal is emitted when the reply detects an error in
     processing. The finished() signal will probably follow, indicating
@@ -442,7 +451,7 @@ QNetworkReplyPrivate::QNetworkReplyPrivate()
     QNetworkAccessManager functions to do that.
 */
 QNetworkReply::QNetworkReply(QObject *parent)
-    : QIODevice(*new QNetworkReplyPrivate, parent)
+    : QNetworkReply(*new QNetworkReplyPrivate, parent)
 {
 }
 
@@ -452,6 +461,8 @@ QNetworkReply::QNetworkReply(QObject *parent)
 QNetworkReply::QNetworkReply(QNetworkReplyPrivate &dd, QObject *parent)
     : QIODevice(dd, parent)
 {
+    // Support the deprecated error() signal:
+    connect(this, &QNetworkReply::errorOccurred, this, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error));
 }
 
 /*!