diff options
| author | Rolland Dudemaine <rolland@ghs.com> | 2011-02-22 15:28:04 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2011-02-22 15:28:04 (GMT) |
| commit | 8ce849b79efeec5cee951846292c7f93c494a612 (patch) | |
| tree | fb3505580fee5e3b51d65b28d488218a9b212110 /src/network/socket | |
| parent | 9e9afc266e501aaeb57a9c7e3cf45d97812e93b3 (diff) | |
| download | Qt-8ce849b79efeec5cee951846292c7f93c494a612.zip Qt-8ce849b79efeec5cee951846292c7f93c494a612.tar.gz Qt-8ce849b79efeec5cee951846292c7f93c494a612.tar.bz2 | |
Use TCP_LOCALSOCKET on INTEGRITY
Use TCP localsockets on INTEGRITY, and other small INTEGRITY fixes
Merge-request: 1101
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qlocalsocket.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/socket.pri | 10 |
2 files changed, 11 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 diff --git a/src/network/socket/socket.pri b/src/network/socket/socket.pri index 2bafe13..3ccc8e0 100644 --- a/src/network/socket/socket.pri +++ b/src/network/socket/socket.pri @@ -43,3 +43,13 @@ wince*: { DEFINES += QT_LOCALSOCKET_TCP } + +integrity: { + SOURCES -= socket/qlocalsocket_unix.cpp \ + socket/qlocalserver_unix.cpp + SOURCES += socket/qlocalsocket_tcp.cpp \ + socket/qlocalserver_tcp.cpp \ + socket/qnativesocketengine_unix.cpp + + DEFINES += QT_LOCALSOCKET_TCP +} |