diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 08:08:26 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 08:08:26 (GMT) |
| commit | e3fcbf32285fe5033260affc3088deaa6fad6fc7 (patch) | |
| tree | 1b9617ce375fafefa3b709d751d264bf0a239454 /src/network | |
| parent | 3782dc6d92210e9ae5fb7ee27cc7cd78dee79ebf (diff) | |
| parent | 43482fcfc106864f104f463002575c389d40b12f (diff) | |
| download | Qt-e3fcbf32285fe5033260affc3088deaa6fad6fc7.zip Qt-e3fcbf32285fe5033260affc3088deaa6fad6fc7.tar.gz Qt-e3fcbf32285fe5033260affc3088deaa6fad6fc7.tar.bz2 | |
Merge earth-team into origin/4.8
Conflicts:
configure
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 8569817..7509e2c 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -288,7 +288,7 @@ QHostInfo QHostInfoPrivate::fromName(const QString &name, QSharedPointer<QNetwor #ifndef Q_OS_SYMBIAN // This function has a special implementation for symbian right now in qhostinfo_symbian.cpp but not on other OS. -QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetworkSession> networkSession) +QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetworkSession>) { Q_UNUSED(networkSession); return QHostInfoAgent::fromName(hostName); |