Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

Conflicts:
	src/corelib/io/qfilesystemwatcher_symbian.cpp
	src/corelib/io/qfilesystemwatcher_symbian_p.h

1 files changed, 3 insertions, 12 deletions

diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index c8def4a..44e6b3a 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -163,16 +163,13 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver,
     QWindowsSockInit bust; // makes sure WSAStartup was callled
 #endif
 
-    // Support for IDNA
-    QString lookup = QString::fromLatin1(QUrl::toAce(name));
-
     QScopedPointer<QHostInfoResult> result(new QHostInfoResult);
     result.data()->autoDelete = false;
     QObject::connect(result.data(), SIGNAL(resultsReady(QHostInfo)),
                      receiver, member);
     int id = result.data()->lookupId = theIdCounter.fetchAndAddRelaxed(1);
 
-    if (lookup.isEmpty()) {
+    if (name.isEmpty()) {
         QHostInfo info(id);
         info.setError(QHostInfo::HostNotFound);
         info.setErrorString(QObject::tr("No host name given"));
@@ -183,7 +180,7 @@ int QHostInfo::lookupHost(const QString &name, QObject *receiver,
     }
 
     QHostInfoAgent *agent = theAgent();
-    agent->addHostName(lookup, result.take());
+    agent->addHostName(name, result.take());
 
 #if !defined QT_NO_THREAD
     if (!agent->isRunning())
@@ -227,13 +224,7 @@ QHostInfo QHostInfo::fromName(const QString &name)
     qDebug("QHostInfo::fromName(\"%s\")",name.toLatin1().constData());
 #endif
 
-    if (!name.isEmpty())
-        return QHostInfoAgent::fromName(QLatin1String(QUrl::toAce(name)));
-
-    QHostInfo retval;
-    retval.d->err = HostNotFound;
-    retval.d->errorStr = QObject::tr("No host name given");
-    return retval;
+    return QHostInfoAgent::fromName(name);
 }
 
 /*!