diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-08-27 07:51:43 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2019-08-27 07:51:43 +0300 |
commit | ceeb9952b29345b662669a6a0a5c4dadf49db114 (patch) | |
tree | b9572f228c24304380b9f7b2f815a7b330e7f051 /src/websockets/qwebsocketdataprocessor_p.h | |
parent | 6e1fa958c289de639753a60a9384bd94db0e91a8 (diff) | |
parent | a302c6108d79b02a339b4ca93d2fce0b58386d51 (diff) | |
download | qtwebsockets-ceeb9952b29345b662669a6a0a5c4dadf49db114.tar.gz |
Merge dev into 5.14
Change-Id: I2eaffbe6e9519a78d0f8663c0870f24cb006d222
Diffstat (limited to 'src/websockets/qwebsocketdataprocessor_p.h')
-rw-r--r-- | src/websockets/qwebsocketdataprocessor_p.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/websockets/qwebsocketdataprocessor_p.h b/src/websockets/qwebsocketdataprocessor_p.h index e80a843..41226d6 100644 --- a/src/websockets/qwebsocketdataprocessor_p.h +++ b/src/websockets/qwebsocketdataprocessor_p.h @@ -55,6 +55,8 @@ #include <QtCore/QByteArray> #include <QtCore/QString> #include <QtCore/QTextCodec> +#include <QTimer> +#include "qwebsocketframe_p.h" #include "qwebsocketprotocol.h" #include "qwebsocketprotocol_p.h" @@ -111,8 +113,11 @@ private: quint64 m_payloadLength; QTextCodec::ConverterState *m_pConverterState; QTextCodec *m_pTextCodec; + QWebSocketFrame frame; + QTimer waitTimer; bool processControlFrame(const QWebSocketFrame &frame); + void timeout(); }; QT_END_NAMESPACE |