diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-30 15:21:33 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-06-30 15:21:33 (GMT) |
| commit | aa59008b92d4d1eb5b45352cac3408cc39086dba (patch) | |
| tree | 13d3014d707b86e293726fd38d0e75d1354f378e /src/network | |
| parent | e0463464773f5eb2bda98a467a9c91092a1f1964 (diff) | |
| parent | cd796aa6dcdf83fa50ced56a9885835fda851a09 (diff) | |
| download | Qt-aa59008b92d4d1eb5b45352cac3408cc39086dba.zip Qt-aa59008b92d4d1eb5b45352cac3408cc39086dba.tar.gz Qt-aa59008b92d4d1eb5b45352cac3408cc39086dba.tar.bz2 | |
Merge commit 'origin/4.5'
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/socket/qlocalserver_tcp.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp index b248f2f..bcf822e 100644 --- a/src/network/socket/qlocalserver_tcp.cpp +++ b/src/network/socket/qlocalserver_tcp.cpp @@ -92,7 +92,7 @@ void QLocalServerPrivate::waitForNewConnection(int msec, bool *timedOut) { if (pendingConnections.isEmpty()) tcpServer.waitForNewConnection(msec, timedOut); - else + else if (timedOut) *timedOut = false; } |