diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-31 08:24:21 +0200 |
commit | f510a51dace0cb39a93b057b8fcbcbdda33a956e (patch) | |
tree | cd1dac8a78ecbb7579c59bf9f0b0d2d6fba56b4a /src/network | |
parent | ccedc853a67da078ace234af7b23fbf861736f3f (diff) | |
parent | 84830fc07d65d58fce9b24b5ec8f1224b0969ac0 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I843994939f126ced22f7fe978ec4403f599fc7c9
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/socket/qabstractsocket.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 87ef31fb22..34a8025cdd 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -110,12 +110,12 @@ To close the socket, call disconnectFromHost(). QAbstractSocket enters QAbstractSocket::ClosingState. After all pending data has been written to the socket, QAbstractSocket actually closes the socket, enters - QAbstractSocket::ClosedState, and emits disconnected(). If you want to - abort a connection immediately, discarding all pending data, call abort() - instead. If the remote host closes the connection, QAbstractSocket will - emit error(QAbstractSocket::RemoteHostClosedError), during which the socket - state will still be ConnectedState, and then the disconnected() signal - will be emitted. + QAbstractSocket::UnconnectedState, and emits disconnected(). If you want + to abort a connection immediately, discarding all pending data, call + abort() instead. If the remote host closes the connection, + QAbstractSocket will emit error(QAbstractSocket::RemoteHostClosedError), + during which the socket state will still be ConnectedState, and then the + disconnected() signal will be emitted. The port and address of the connected peer is fetched by calling peerPort() and peerAddress(). peerName() returns the host name of |