From 7a20cf9d4419cf1a5a9a4ed450b03caa8716fd58 Mon Sep 17 00:00:00 2001
From: Olivier Goffart <olivier.goffart@nokia.com>
Date: Tue, 3 May 2011 10:12:30 +0200
Subject: Fix compilation

Conflicts between 61c6d66b7efd8de4a83b021e7c4ef2b1a803ece2 and 940f16babab76b328b7c9bfdb5435102c689b76b
---
 src/network/kernel/qhostinfo.cpp | 1 -
 1 file changed, 1 deletion(-)

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
-- 
cgit v0.12