diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 08:12:30 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-03 08:12:30 (GMT) |
| commit | 7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58 (patch) | |
| tree | 346becbd879f7f8e3789ae517353232f18f67c6d /src/network/kernel | |
| parent | e3fcbf32285fe5033260affc3088deaa6fad6fc7 (diff) | |
| download | Qt-7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58.zip Qt-7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58.tar.gz Qt-7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58.tar.bz2 | |
Fix compilation
Conflicts between 61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2 and 940f16babab76b328b7c9bfdb5435102c689b76b
Diffstat (limited to 'src/network/kernel')
| -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 7509e2c..c86f510 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 |