1 files changed, 24 insertions, 5 deletions

diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp
index cbc4114904..0d9e25954d 100644
--- a/src/network/socket/qabstractsocket.cpp
+++ b/src/network/socket/qabstractsocket.cpp
@@ -215,7 +215,7 @@
     connections, you will have to register it with Q_DECLARE_METATYPE() and
     qRegisterMetaType().
 
-    \sa error(), errorString(), {Creating Custom Qt Types}
+    \sa socketError(), errorString(), {Creating Custom Qt Types}
 */
 
 /*!
@@ -329,7 +329,7 @@
            is non-blocking).
 
     \value UnknownSocketError An unidentified error occurred.
-    \sa QAbstractSocket::error()
+    \sa QAbstractSocket::socketError()
 */
 
 /*!
@@ -2094,7 +2094,7 @@ QVariant QAbstractSocket::socketOption(QAbstractSocket::SocketOption option)
     Waits until the socket is connected, up to \a msecs
     milliseconds. If the connection has been established, this
     function returns \c true; otherwise it returns \c false. In the case
-    where it returns \c false, you can call error() to determine
+    where it returns \c false, you can call socketError() to determine
     the cause of the error.
 
     The following example waits up to one second for a connection
@@ -2873,7 +2873,7 @@ void QAbstractSocket::setReadBufferSize(qint64 size)
 /*!
     Returns the state of the socket.
 
-    \sa error()
+    \sa socketError()
 */
 QAbstractSocket::SocketState QAbstractSocket::state() const
 {
@@ -2900,16 +2900,35 @@ QAbstractSocket::SocketType QAbstractSocket::socketType() const
     return d_func()->socketType;
 }
 
+#if QT_DEPRECATED_SINCE(5, 15)
 /*!
+    \deprecated
+
+    Use socketError() instead.
+
     Returns the type of error that last occurred.
 
-    \sa state(), errorString()
+    \sa state(), errorString(), socketError()
 */
 QAbstractSocket::SocketError QAbstractSocket::error() const
 {
+    return socketError();
+}
+#endif //  QT_DEPRECATED_SINCE(5, 15)
+
+/*!
+    \since 5.15
+
+    Returns the type of error that last occurred.
+
+    \sa state(), errorString()
+*/
+QAbstractSocket::SocketError QAbstractSocket::socketError() const
+{
     return d_func()->socketError;
 }
 
+
 /*!
     Sets the type of error that last occurred to \a socketError.