summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
authorAleksandar Sasha Babic <aleksandar.babic@nokia.com>2009-05-21 16:14:08 (GMT)
committerAleksandar Sasha Babic <aleksandar.babic@nokia.com>2009-05-21 16:14:08 (GMT)
commit16064f14487c81ce9e75962625885bf90c958db8 (patch)
treea34538ae9ea97e97a3adea2860f200697a5808ca /src/network
parent1a58ac0a27c6e006b9d86827d7e4b1000f56ae38 (diff)
downloadQt-16064f14487c81ce9e75962625885bf90c958db8.zip
Qt-16064f14487c81ce9e75962625885bf90c958db8.tar.gz
Qt-16064f14487c81ce9e75962625885bf90c958db8.tar.bz2
This is ugly hack to make snedData test case in qlocalsocket to pass.
This definitely has to be reviewed and changed, especially when generic problem with socket notifier and sync operations on sockets is solved.
Diffstat (limited to 'src/network')
-rw-r--r--src/network/socket/qlocalserver.cpp4
-rw-r--r--src/network/socket/qlocalsocket_unix.cpp3
2 files changed, 6 insertions, 1 deletions
diff --git a/src/network/socket/qlocalserver.cpp b/src/network/socket/qlocalserver.cpp
index d6b1507..35701a7 100644
--- a/src/network/socket/qlocalserver.cpp
+++ b/src/network/socket/qlocalserver.cpp
@@ -276,6 +276,10 @@ QLocalSocket *QLocalServer::nextPendingConnection()
if (d->pendingConnections.isEmpty())
return 0;
QLocalSocket *nextSocket = d->pendingConnections.dequeue();
+#ifdef Q_OS_SYMBIAN
+ if(!d->socketNotifier)
+ return nextSocket;
+#endif
#ifndef Q_OS_WIN
d->socketNotifier->setEnabled(d->pendingConnections.size()
<= d->maxPendingConnections);
diff --git a/src/network/socket/qlocalsocket_unix.cpp b/src/network/socket/qlocalsocket_unix.cpp
index 2471043..9e3cbde 100644
--- a/src/network/socket/qlocalsocket_unix.cpp
+++ b/src/network/socket/qlocalsocket_unix.cpp
@@ -237,7 +237,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode)
QLatin1String("QLocalSocket::connectToServer"));
return;
}
-
+#ifndef Q_OS_SYMBIAN
// set non blocking so we can try to connect and it wont wait
int flags = fcntl(d->connectingSocket, F_GETFL, 0);
if (-1 == flags
@@ -246,6 +246,7 @@ void QLocalSocket::connectToServer(const QString &name, OpenMode openMode)
QLatin1String("QLocalSocket::connectToServer"));
return;
}
+#endif
// _q_connectToSocket does the actual connecting
d->connectingName = name;