diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-20 08:34:46 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-02-20 08:34:46 +0100 |
| commit | 41ecb6abbf371e4b774f3123c87e314c40bfaba3 (patch) | |
| tree | 3de5b56e081177a61cea932e7ecbe60db66fcde3 /src/network | |
| parent | d928beb024c240b37d35d2c53f25648c99a484b4 (diff) | |
| parent | 7981dbfaf371a368fbd69e935768b310f42a0e5a (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ide8768d0d95aaeec943658aea27a03737d7dbf3f
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/socket/qlocalsocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp index 38e47d6e26..18f400fe0b 100644 --- a/src/network/socket/qlocalsocket.cpp +++ b/src/network/socket/qlocalsocket.cpp @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE On Windows this is a named pipe and on Unix this is a local domain socket. - If an error occurs, socketError() returns the type of error, and + If an error occurs, error() returns the type of error, and errorString() can be called to get a human readable description of what happened. |