diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 03:02:17 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-21 13:59:09 +0100 |
| commit | 6498859f9cebbc2299e679fb93d5aacdc699fb5c (patch) | |
| tree | 6363f476eb3fab5f2fd95aff70028952ce79b4c8 /src/websockets/qwebsocket_p.cpp | |
| parent | 9f1bfd08c47de2a1f59b406ae57e5a90d2670ea6 (diff) | |
| parent | b28c271f549208f0b41bed4752b53e5750711a35 (diff) | |
| download | qtwebsockets-6498859f9cebbc2299e679fb93d5aacdc699fb5c.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.15' into dev"
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 01b58b5..51738ed 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->error(); + err = m_pSocket->socketError(); return err; } |