1 files changed, 10 insertions, 10 deletions

diff --git a/src/network/socket/qhttpsocketengine.cpp b/src/network/socket/qhttpsocketengine.cpp
index c67b273937..9de9b284c1 100644
--- a/src/network/socket/qhttpsocketengine.cpp
+++ b/src/network/socket/qhttpsocketengine.cpp
@@ -72,7 +72,7 @@ bool QHttpSocketEngine::initialize(QAbstractSocket::SocketType type, QAbstractSo
     setSocketType(type);
     d->socket = new QTcpSocket(this);
     d->reply = new QHttpNetworkReply(QUrl(), this);
-#ifndef QT_NO_BEARERMANAGEMENT
+#ifndef QT_NO_BEARERMANAGEMENT // ### Qt6: Remove section
     d->socket->setProperty("_q_networkSession", property("_q_networkSession"));
 #endif
 
@@ -93,7 +93,7 @@ bool QHttpSocketEngine::initialize(QAbstractSocket::SocketType type, QAbstractSo
     connect(d->socket, SIGNAL(bytesWritten(qint64)),
             this, SLOT(slotSocketBytesWritten()),
             Qt::DirectConnection);
-    connect(d->socket, SIGNAL(error(QAbstractSocket::SocketError)),
+    connect(d->socket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)),
             this, SLOT(slotSocketError(QAbstractSocket::SocketError)),
             Qt::DirectConnection);
     connect(d->socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
@@ -216,7 +216,7 @@ void QHttpSocketEngine::close()
     if (d->socket) {
         d->socket->close();
         delete d->socket;
-        d->socket = 0;
+        d->socket = nullptr;
     }
 }
 
@@ -586,7 +586,7 @@ void QHttpSocketEngine::slotSocketReadNotification()
     }
 
     int statusCode = d->reply->statusCode();
-    QAuthenticatorPrivate *priv = 0;
+    QAuthenticatorPrivate *priv = nullptr;
     if (statusCode == 200) {
         d->state = Connected;
         setLocalAddress(d->socket->localAddress());
@@ -829,8 +829,8 @@ QHttpSocketEnginePrivate::QHttpSocketEnginePrivate()
     , credentialsSent(false)
     , pendingResponseData(0)
 {
-    socket = 0;
-    reply = 0;
+    socket = nullptr;
+    reply = nullptr;
     state = QHttpSocketEngine::None;
 }
 
@@ -843,15 +843,15 @@ QAbstractSocketEngine *QHttpSocketEngineHandler::createSocketEngine(QAbstractSoc
                                                                     QObject *parent)
 {
     if (socketType != QAbstractSocket::TcpSocket)
-        return 0;
+        return nullptr;
 
     // proxy type must have been resolved by now
     if (proxy.type() != QNetworkProxy::HttpProxy)
-        return 0;
+        return nullptr;
 
     // we only accept active sockets
     if (!qobject_cast<QAbstractSocket *>(parent))
-        return 0;
+        return nullptr;
 
     QHttpSocketEngine *engine = new QHttpSocketEngine(parent);
     engine->setProxy(proxy);
@@ -860,7 +860,7 @@ QAbstractSocketEngine *QHttpSocketEngineHandler::createSocketEngine(QAbstractSoc
 
 QAbstractSocketEngine *QHttpSocketEngineHandler::createSocketEngine(qintptr, QObject *)
 {
-    return 0;
+    return nullptr;
 }
 
 QT_END_NAMESPACE