diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 10:12:30 +0200 |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-10 12:54:54 +0200 |
| commit | 94beee1c37d0a58f7193889badae44e3e159f77e (patch) | |
| tree | 0921559f41fa71ed04e30542f967fb8ac33fdbc3 /src | |
| parent | 8b7bebd45d44bf529922c54a5801d72a56adf11a (diff) | |
Fix compilation
Conflicts between 61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2 and 940f16babab76b328b7c9bfdb5435102c689b76b
(cherry picked from commit 7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58)
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/kernel/qhostinfo.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp index 7509e2cd7e..c86f510914 100644 --- a/src/network/kernel/qhostinfo.cpp +++ b/src/network/kernel/qhostinfo.cpp @@ -290,7 +290,6 @@ QHostInfo QHostInfoPrivate::fromName(const QString &name, QSharedPointer<QNetwor // 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>) { - Q_UNUSED(networkSession); return QHostInfoAgent::fromName(hostName); } #endif |