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

Change-Id: I469b0501cc65fc5ce4d797a69ae89405cc69c7f8

1 files changed, 2 insertions, 21 deletions

diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index c22dce8f1c3..fb30bfd4f18 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -554,32 +554,13 @@ QNetworkAccessManager::Operation QNetworkReply::operation() const
     return d_func()->operation;
 }
 
-#if QT_DEPRECATED_SINCE(5, 15)
 /*!
-    \deprecated
-
-    Use networkError() instead.
-
-    Returns the error that was found during the processing of this
-    request. If no error was found, returns NoError.
-
-    \sa setError(), networkError()
-*/
-QNetworkReply::NetworkError QNetworkReply::error() const
-{
-    return networkError();
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
-/*!
-    \since 5.15
-
     Returns the error that was found during the processing of this
     request. If no error was found, returns NoError.
 
     \sa setError()
 */
-QNetworkReply::NetworkError QNetworkReply::networkError() const
+QNetworkReply::NetworkError QNetworkReply::error() const
 {
     return d_func()->errorCode;
 }
@@ -877,7 +858,7 @@ void QNetworkReply::setRequest(const QNetworkRequest &request)
     Calling setError() does not emit the error(QNetworkReply::NetworkError)
     signal.
 
-    \sa error(), errorString(), networkError()
+    \sa error(), errorString()
 */
 void QNetworkReply::setError(NetworkError errorCode, const QString &errorString)
 {