summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@trolltech.com>2009-05-06 13:58:27 (GMT)
committerJoerg Bornemann <joerg.bornemann@trolltech.com>2009-05-06 13:58:27 (GMT)
commit980256ac1012f236a600d2a613229c50258a1ed8 (patch)
tree2a1b45524d18f3973c40b7d2646daf2715943bad
parentbcf7c498f0bd29f1ee9c7f226b3a656f1c05e35e (diff)
downloadQt-980256ac1012f236a600d2a613229c50258a1ed8.zip
Qt-980256ac1012f236a600d2a613229c50258a1ed8.tar.gz
Qt-980256ac1012f236a600d2a613229c50258a1ed8.tar.bz2
fix compilation of QLocalServer when QT_LOCALSOCKET_TCP is defined
When QT_LOCALSOCKET_TCP is defined we cannot call setEnabled on the socket notifier. Reviewed-by: ossi
-rw-r--r--src/network/socket/qlocalserver.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp
index 1815d73..77a999b 100644
--- a/src/network/socket/qlocalserver.cpp
+++ b/src/network/socket/qlocalserver.cpp
@@ -276,12 +276,14 @@ QLocalSocket *QLocalServer::nextPendingConnection()
if (d->pendingConnections.isEmpty())
return 0;
QLocalSocket *nextSocket = d->pendingConnections.dequeue();
+#ifndef QT_LOCALSOCKET_TCP
if (d->pendingConnections.size() <= d->maxPendingConnections)
#ifndef Q_OS_WIN
d->socketNotifier->setEnabled(true);
#else
d->connectionEventNotifier->setEnabled(true);
#endif
+#endif
return nextSocket;
}