summaryrefslogtreecommitdiff
path: root/src/websockets
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-21 03:00:29 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-04-21 03:00:29 +0200
commit35597c5f5aa3aafc332e3718029bcf3c0c010fa0 (patch)
tree5586c4496588f71ae42820ede2bbc93c93f5a3a6 /src/websockets
parentbd100e777190f68c4da11d4f7a1c4bf8274211d9 (diff)
parent416ca205ed89d5edf8cc0e3bb32b404b38f9f2ee (diff)
downloadqtwebsockets-35597c5f5aa3aafc332e3718029bcf3c0c010fa0.tar.gz
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: If3f9affe2d1768ea9fc741d9be2a749d3baf2153
Diffstat (limited to 'src/websockets')
-rw-r--r--src/websockets/qwebsocket_p.cpp2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp
index 9b29114..f4ed311 100644
--- a/src/websockets/qwebsocket_p.cpp
+++ b/src/websockets/qwebsocket_p.cpp
@@ -573,8 +573,6 @@ void QWebSocketPrivate::makeConnections(const QTcpSocket *pTcpSocket)
QObject::connect(pTcpSocket, &QAbstractSocket::readChannelFinished, q,
&QWebSocket::readChannelFinished);
QObject::connect(pTcpSocket, &QAbstractSocket::aboutToClose, q, &QWebSocket::aboutToClose);
- QObject::connect(pTcpSocket, &QAbstractSocket::bytesWritten, q, &QWebSocket::bytesWritten);
-
QObjectPrivate::connect(pTcpSocket, &QObject::destroyed,
this, &QWebSocketPrivate::socketDestroyed);