1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation

Browse Source 
Conflicts between 61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2 and 940f16babab76b328b7c9bfdb5435102c689b76b
(cherry picked from commit 7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58)
This commit is contained in:
Olivier Goffart 2011-05-03 10:12:30 +02:00
parent 8b7bebd45d
commit 94beee1c37
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/kernel/qhostinfo.cpp
View File

@ -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. // 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>) QHostInfo QHostInfoAgent::fromName(const QString &hostName, QSharedPointer<QNetworkSession>)
{ {
Q_UNUSED(networkSession);
return QHostInfoAgent::fromName(hostName); return QHostInfoAgent::fromName(hostName);
} }
#endif #endif