diff options
| author | mread <qt-info@nokia.com> | 2009-08-19 09:19:21 (GMT) |
|---|---|---|
| committer | mread <qt-info@nokia.com> | 2009-08-19 09:19:21 (GMT) |
| commit | 29572e28a17ff569cd100936164abee6d527c9d8 (patch) | |
| tree | d77db6dd98a7b40408f2db887ec9329814e1484c /src/network/socket | |
| parent | c162acb326cdd53b080c99a75f91d5e8fd4a84be (diff) | |
| parent | ac5bcbd221416ec28c9bcf82c6689f35b3a14f00 (diff) | |
| download | Qt-29572e28a17ff569cd100936164abee6d527c9d8.zip Qt-29572e28a17ff569cd100936164abee6d527c9d8.tar.gz Qt-29572e28a17ff569cd100936164abee6d527c9d8.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qlocalsocket_unix.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp index 2cf8ef6..9211d63 100644 --- a/src/network/socket/qlocalsocket_unix.cpp +++ b/src/network/socket/qlocalsocket_unix.cpp @@ -306,7 +306,6 @@ void QLocalSocketPrivate::_q_connectToSocket() case ETIMEDOUT: errorOccurred(QLocalSocket::SocketTimeoutError, function); break; - case EINPROGRESS: case EAGAIN: // Try again later, all of the sockets listening are full if (!delayConnect) { |