diff options
| author | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-07-10 15:03:43 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@theqtcompany.com> | 2015-09-02 07:05:55 +0000 |
| commit | 1b459a8124b77fdef12e05d8a77b471be9097776 (patch) | |
| tree | 3f82826be254b82417be9485f253db036a1ec8fb /src/network/socket/qabstractsocket.cpp | |
| parent | 29af8741b68db1dff82de9f12d818524cb6d9147 (diff) | |
QAbstractSocket: Always set errorString right after socketError
Otherwise errorString() might not match error() in a
statusChanged handler.
Change-Id: If1250b4552412eabe88457dee031e4ef3f533838
Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/network/socket/qabstractsocket.cpp')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 009bc90bf5..d1b13c1191 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -2086,10 +2086,10 @@ bool QAbstractSocket::waitForConnected(int msecs) if ((timedOut && state() != ConnectedState) || state() == ConnectingState) { d->socketError = SocketTimeoutError; + setErrorString(tr("Socket operation timed out")); d->state = UnconnectedState; emit stateChanged(d->state); d->resetSocketLayer(); - setErrorString(tr("Socket operation timed out")); } #if defined (QABSTRACTSOCKET_DEBUG) |