diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-29 03:06:02 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-29 03:06:03 +0100 |
| commit | 69874130efc7f87147a3317d6ce7a17e6f0a466b (patch) | |
| tree | 38725fa14c4d789a01908f5fd3de7a53e23ebca6 /src/websockets/qwebsocket_p.cpp | |
| parent | fccb43f3ee253cad1aa2b433a9b91fa1a30c7871 (diff) | |
| parent | 87c9513aed424f0c97a78271f59a34873cc7e522 (diff) | |
| download | qtwebsockets-69874130efc7f87147a3317d6ce7a17e6f0a466b.tar.gz | |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: Ib6762714c19354c7adbf0c032d2f9995f576114f
Diffstat (limited to 'src/websockets/qwebsocket_p.cpp')
| -rw-r--r-- | src/websockets/qwebsocket_p.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp index 14895b7..cd0b918 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp @@ -198,7 +198,7 @@ QAbstractSocket::SocketError QWebSocketPrivate::error() const { QAbstractSocket::SocketError err = QAbstractSocket::UnknownSocketError; if (Q_LIKELY(m_pSocket)) - err = m_pSocket->socketError(); + err = m_pSocket->error(); return err; } |