diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-03-24 05:05:43 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2011-03-24 05:06:59 (GMT) |
| commit | 24bfb5cfc80966b15a58be6ef8dc5514d3318af1 (patch) | |
| tree | 153879a8a41148a45c0f66ee74acd4b972bbca50 /src/network/socket/qlocalsocket.cpp | |
| parent | 774a3536b00c4d6e4c4c10b708e31b4373a338e3 (diff) | |
| parent | f5812ae1b669daa921eeabc903ec0eafcfe0c030 (diff) | |
| download | Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.zip Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.tar.gz Qt-24bfb5cfc80966b15a58be6ef8dc5514d3318af1.tar.bz2 | |
Merge qt/qt.git master into qa-team-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 |