Fix compilation
Conflicts between 61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2 and 940f16babab76b328b7c9bfdb5435102c689b76b (cherry picked from commit 7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58)
This commit is contained in:
parent
8b7bebd45d
commit
94beee1c37
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user