diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2011-03-21 18:53:42 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2011-03-22 10:11:34 (GMT) |
| commit | 40fc1a3ca3b7050f317513cf69dd89a01479e098 (patch) | |
| tree | 2fdfe24c95445d1cda24aed56b6690b35c726401 /src/network/socket | |
| parent | 67c6737c6702506b5b09fd84389e20ba539cc000 (diff) | |
| download | Qt-40fc1a3ca3b7050f317513cf69dd89a01479e098.zip Qt-40fc1a3ca3b7050f317513cf69dd89a01479e098.tar.gz Qt-40fc1a3ca3b7050f317513cf69dd89a01479e098.tar.bz2 | |
Implement network session support for synchronous QHostInfo
Private API, QHostInfoPrivate::fromName, which is called from
QAbstractSocket when the network session property is set.
Reviewed-by: Markus Goetz
Diffstat (limited to 'src/network/socket')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index 020de42..801556e 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -367,6 +367,7 @@ #include "qabstractsocket_p.h" #include "private/qhostinfo_p.h" +#include "private/qnetworksession_p.h" #include <qabstracteventdispatcher.h> #include <qhostaddress.h> @@ -1786,6 +1787,14 @@ bool QAbstractSocket::waitForConnected(int msecs) #endif QHostInfo::abortHostLookup(d->hostLookupId); d->hostLookupId = -1; +#ifndef QT_NO_BEARERMANAGEMENT + QSharedPointer<QNetworkSession> networkSession; + QVariant v(property("_q_networksession")); + if (v.isValid()) { + networkSession = qvariant_cast< QSharedPointer<QNetworkSession> >(v); + d->_q_startConnecting(QHostInfoPrivate::fromName(d->hostName, networkSession)); + } else +#endif d->_q_startConnecting(QHostInfo::fromName(d->hostName)); } if (state() == UnconnectedState) |