diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-20 21:12:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-20 21:12:53 +0200 |
| commit | c2201fad153a64f1c6da84390de4316aedf3a2cd (patch) | |
| tree | 0a499309b34087ff7390d77f3a6e8c0266cdd213 /src/websockets/qwebsocket_p.h | |
| parent | d0f71b3feaca6923e89f85993f13cc9da0923412 (diff) | |
| parent | b59b0634715c13a191b678a0652ea4e3274865fa (diff) | |
| download | qtwebsockets-c2201fad153a64f1c6da84390de4316aedf3a2cd.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I8d2c4b0982623839b880a9d8fbe7f5ee69d33ad3
Diffstat (limited to 'src/websockets/qwebsocket_p.h')
| -rw-r--r-- | src/websockets/qwebsocket_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index 260e8e8..037df61 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -143,6 +143,7 @@ public: QSslConfiguration sslConfiguration() const; #endif + void closeGoingAway(); void close(QWebSocketProtocol::CloseCode closeCode, QString reason); void open(const QNetworkRequest &request, bool mask); void ping(const QByteArray &payload); @@ -197,7 +198,7 @@ private: qint64 writeFrames(const QList<QByteArray> &frames) Q_REQUIRED_RESULT; qint64 writeFrame(const QByteArray &frame) Q_REQUIRED_RESULT; - QScopedPointer<QTcpSocket> m_pSocket; + QTcpSocket *m_pSocket; QString m_errorString; QWebSocketProtocol::Version m_version; QUrl m_resource; |