diff options
| author | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-03-08 07:12:58 (GMT) |
|---|---|---|
| committer | Eckhart Koppen <eckhart.koppen@nokia.com> | 2011-03-08 07:12:58 (GMT) |
| commit | cddc9fd3913fa511fbe5feac4c6ff61464bc78fa (patch) | |
| tree | 9ae83863ed3b805d3bb0639d1268906564f9801a /src/network/socket/qlocalsocket.cpp | |
| parent | f96b9e139dd67d2be992e86af9fb41e4cdfcb6cf (diff) | |
| parent | 0766bf2fa4a89e629bbdad185e4919fd49c033a1 (diff) | |
| download | Qt-cddc9fd3913fa511fbe5feac4c6ff61464bc78fa.zip Qt-cddc9fd3913fa511fbe5feac4c6ff61464bc78fa.tar.gz Qt-cddc9fd3913fa511fbe5feac4c6ff61464bc78fa.tar.bz2 | |
Merge remote branch 'qt-master/master'
Diffstat (limited to 'src/network/socket/qlocalsocket.cpp')
| -rw-r--r-- | src/network/socket/qlocalsocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp index 8fa4b92..9a2b0ba 100644 --- a/src/network/socket/qlocalsocket.cpp +++ b/src/network/socket/qlocalsocket.cpp @@ -346,7 +346,7 @@ QLocalSocket::QLocalSocket(QObject * parent) QLocalSocket::~QLocalSocket() { close(); -#ifndef Q_OS_WIN +#if !defined(Q_OS_WIN) && !defined(QT_LOCALSOCKET_TCP) Q_D(QLocalSocket); d->unixSocket.setParent(0); #endif |