diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-11 11:00:27 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-11 11:00:27 +0200 |
| commit | b25dc4141782776ff321400c204a27ab3adbcea6 (patch) | |
| tree | f6523278592e03c8900f09ddda95f594d7d622b2 /src/websockets/qwebsocket_p.h | |
| parent | ba3b71327577f3ea348e9511c1475cf48f821880 (diff) | |
| parent | 0a9cbcf2894f4f9e621e0f5fb644d2b5e15ab2c7 (diff) | |
| download | qtwebsockets-b25dc4141782776ff321400c204a27ab3adbcea6.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/websockets/qwebsocket_p.cpp
Change-Id: Ia6434b282b4a0ee92e2b2a8664389f325bd0fcb0
Diffstat (limited to 'src/websockets/qwebsocket_p.h')
| -rw-r--r-- | src/websockets/qwebsocket_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index e688463..615bcfc 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -162,6 +162,8 @@ private: void setSocketState(QAbstractSocket::SocketState state); void setErrorString(const QString &errorString); + void socketDestroyed(QObject *socket); + void processData(); void processPing(const QByteArray &data); void processPong(const QByteArray &data); |