diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-01-28 17:38:56 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-02-01 11:35:03 (GMT) |
| commit | 85ee65df53ddece16b9d51fae0de1dd36564564a (patch) | |
| tree | 0c523fa13592af69cb847fb195fdb99b19e26269 | |
| parent | 07416116e30ec526506c6f2c97be4499b898dda0 (diff) | |
| download | Qt-85ee65df53ddece16b9d51fae0de1dd36564564a.zip Qt-85ee65df53ddece16b9d51fae0de1dd36564564a.tar.gz Qt-85ee65df53ddece16b9d51fae0de1dd36564564a.tar.bz2 | |
Fix compile errors when TCP local sockets configured on symbian
Reviewed-by: Markus Goetz
| -rw-r--r-- | src/network/socket/qlocalserver.cpp | 2 | ||||
| -rw-r--r-- | src/network/socket/qlocalsocket.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp index ef7fc02..6d8b889 100644 --- a/src/network/socket/qlocalserver.cpp +++ b/src/network/socket/qlocalserver.cpp @@ -274,11 +274,11 @@ QLocalSocket *QLocalServer::nextPendingConnection() if (d->pendingConnections.isEmpty()) return 0; QLocalSocket *nextSocket = d->pendingConnections.dequeue(); +#ifndef QT_LOCALSOCKET_TCP #ifdef Q_OS_SYMBIAN if(!d->socketNotifier) return nextSocket; #endif -#ifndef QT_LOCALSOCKET_TCP if (d->pendingConnections.size() <= d->maxPendingConnections) #ifndef Q_OS_WIN d->socketNotifier->setEnabled(true); diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp index 2eb1700..aa11d05 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 |