diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:13:58 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-10-20 19:13:58 +0200 |
| commit | c47ce34597b085b6c6ab03a12e2ed6b246f330ff (patch) | |
| tree | 5e1caf130f2f2524a08a372567815591907a9f00 /src/websockets/qwebsocket_p.cpp | |
| parent | 54d8d71690510a577abb2d72b24e6eb5b47e85a9 (diff) | |
| parent | 0854eda408de542047a0ef38c37953719a8f9fde (diff) | |
| download | qtwebsockets-c47ce34597b085b6c6ab03a12e2ed6b246f330ff.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I587edb09f88db76917755593bfe0cbb5c460ce96
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index e1a36c8..602a939 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -541,6 +541,7 @@ 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); //catch signals QObjectPrivate::connect(pTcpSocket, &QAbstractSocket::stateChanged, this, |