diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-08-17 13:58:48 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-08-17 13:58:48 (GMT) |
| commit | ff6f17c92ad1bfa898bc89a5ccb65361d443c591 (patch) | |
| tree | f0ac9ead3755b886975dada5c977e969600526fd /src/network/socket/qnativesocketengine_unix.cpp | |
| parent | cd1b5d933575fb801ad3014f3d7fd7c268a362d1 (diff) | |
| parent | 1970e2d46656db8178636e06c82287f536b626c7 (diff) | |
| download | Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.zip Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.gz Qt-ff6f17c92ad1bfa898bc89a5ccb65361d443c591.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/network/socket/qnativesocketengine_unix.cpp')
| -rw-r--r-- | src/network/socket/qnativesocketengine_unix.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp index f91ce5f..fe28863 100644 --- a/src/network/socket/qnativesocketengine_unix.cpp +++ b/src/network/socket/qnativesocketengine_unix.cpp @@ -562,7 +562,7 @@ int QNativeSocketEnginePrivate::nativeAccept() #else int acceptedDescriptor = qt_safe_accept(socketDescriptor, 0, 0); #endif - //check if we have vaild descriptor at all + //check if we have valid descriptor at all if(acceptedDescriptor > 0) { // Ensure that the socket is closed on exec*() ::fcntl(acceptedDescriptor, F_SETFD, FD_CLOEXEC); |