diff options
| author | Qt Forward Merge Bot <[email protected]> | 2019-11-06 01:00:08 +0100 |
|---|---|---|
| committer | Edward Welbourne <[email protected]> | 2019-11-06 11:41:19 +0100 |
| commit | e3cc16e9fba045b3d195bc0e35dff4735bb6f59c (patch) | |
| tree | a048d9ecb07ae175b4b357216c7e3e74d41c1271 /src/network/socket/qabstractsocket.cpp | |
| parent | 2e63d121839dae2794685001563783eea4c997f0 (diff) | |
| parent | 7f0aaa88ef1db3840bd504d63a38d53032b8f802 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts:
.qmake.conf
mkspecs/features/mac/default_post.prf
src/corelib/tools/qsimd_p.h
src/platformsupport/fontdatabases/mac/qcoretextfontdatabase.mm
util/qfloat16-tables/gen_qfloat16_tables.cpp
Change-Id: If48fa8a3bc3c983706b609a6d3822cb67c1352a4
Diffstat (limited to 'src/network/socket/qabstractsocket.cpp')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 9c8f29e18ab..b1ea9a41330 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -2359,11 +2359,12 @@ bool QAbstractSocket::waitForBytesWritten(int msecs) } /*! - Waits until the socket has disconnected, up to \a msecs - milliseconds. If the connection has been disconnected, this - function returns \c true; otherwise it returns \c false. In the case - where it returns \c false, you can call error() to determine - the cause of the error. + Waits until the socket has disconnected, up to \a msecs milliseconds. If the + connection was successfully disconnected, this function returns \c true; + otherwise it returns \c false (if the operation timed out, if an error + occurred, or if this QAbstractSocket is already disconnected). In the case + where it returns \c false, you can call error() to determine the cause of + the error. The following example waits up to one second for a connection to be closed: |