diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-05 03:01:45 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-05 03:01:45 +0100 |
| commit | 5b1f4d038f27ae37a434f87c605422ac8452f1ef (patch) | |
| tree | 3938c121184522be9689a0c43f0f6fc946297ef3 /src/websockets/qwebsocket_p.h | |
| parent | 9440ee8df0cbf374a3cf54ff72543ebfa1ab7898 (diff) | |
| parent | 16bfc98a03186cef5aafa79709b086faa0d4f9f2 (diff) | |
| download | qtwebsockets-5b1f4d038f27ae37a434f87c605422ac8452f1ef.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ia08fda4945ea3fd0b7b13f6f65963c7b4fa31468
Diffstat (limited to 'src/websockets/qwebsocket_p.h')
| -rw-r--r-- | src/websockets/qwebsocket_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index fd631d4..4b39dfc 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -158,6 +158,7 @@ public: void close(QWebSocketProtocol::CloseCode closeCode, QString reason); void open(const QNetworkRequest &request, bool mask); void ping(const QByteArray &payload); + void setSocketState(QAbstractSocket::SocketState state); private: QWebSocketPrivate(QTcpSocket *pTcpSocket, QWebSocketProtocol::Version version); @@ -168,7 +169,6 @@ private: void setProtocol(const QString &protocol); void setExtension(const QString &extension); void enableMasking(bool enable); - void setSocketState(QAbstractSocket::SocketState state); void setErrorString(const QString &errorString); void socketDestroyed(QObject *socket); |