diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 08:46:18 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-08 08:46:18 (GMT) |
| commit | 02fcd5e346da13cbb65523de2348880cf7d7a073 (patch) | |
| tree | b125e523779c96d5cf4f2ec94eedfc71d398b3ea /src | |
| parent | 4d3d0aaf7de3e92fe77ac69f0268d2e03c6f41cc (diff) | |
| parent | 4e9eb911ffc70959d81de01fe9fe4a704cafe3eb (diff) | |
| download | Qt-02fcd5e346da13cbb65523de2348880cf7d7a073.zip Qt-02fcd5e346da13cbb65523de2348880cf7d7a073.tar.gz Qt-02fcd5e346da13cbb65523de2348880cf7d7a073.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging:
fix QLocalSocket::isValid() on Windows
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/socket/qlocalsocket_win.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index 468bf8d..bd566a5 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -574,10 +574,7 @@ bool QLocalSocket::waitForDisconnected(int msecs) bool QLocalSocket::isValid() const { Q_D(const QLocalSocket); - if (d->handle == INVALID_HANDLE_VALUE) - return false; - - return PeekNamedPipe(d->handle, NULL, 0, NULL, NULL, NULL); + return d->handle != INVALID_HANDLE_VALUE; } bool QLocalSocket::waitForReadyRead(int msecs) |