diff options
| author | Martin Petersson <Martin.Petersson@nokia.com> | 2012-03-30 13:07:33 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-02 14:52:48 +0200 |
| commit | 0e6361d31693ec426774494cd8d3a5a46ae93ed1 (patch) | |
| tree | b5716350d1d815cdb2c980f142ca02612c983e57 /src | |
| parent | a84b42e6194be0f40bd8f961effef9947c07c832 (diff) | |
QAbstractSocket::waitForConnected check if host name is an IP address
If the current host name is an ip address we can create the QHostInfo
directly instead of performing a reverse lookup.
Task-number: QTBUG-18881
Change-Id: If239481e455f4f7fb74d978f685dc5d8e9f22c0a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jonas Gastal <jgastal@profusion.mobi>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/socket/qabstractsocket.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index af22b20b21..0c4eed8de9 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -1984,7 +1984,16 @@ bool QAbstractSocket::waitForConnected(int msecs) d->_q_startConnecting(QHostInfoPrivate::fromName(d->hostName, networkSession)); } else #endif - d->_q_startConnecting(QHostInfo::fromName(d->hostName)); + { + QHostAddress temp; + if (temp.setAddress(d->hostName)) { + QHostInfo info; + info.setAddresses(QList<QHostAddress>() << temp); + d->_q_startConnecting(info); + } else { + d->_q_startConnecting(QHostInfo::fromName(d->hostName)); + } + } } if (state() == UnconnectedState) return false; // connect not im progress anymore! |