3 files changed, 16 insertions, 10 deletions
diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index a26a1fcb9..8bad6d3ee 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -68,8 +68,8 @@ static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phas
   \inmodule QtNetwork
 
   The QAuthenticator class is usually used in the
-  \l{QHttp::}{authenticationRequired()} and
-  \l{QHttp::}{proxyAuthenticationRequired()} signals of QHttp and
+  \l{QNetworkAccessManager::}{authenticationRequired()} and
+  \l{QNetworkAccessManager::}{proxyAuthenticationRequired()} signals of QNetworkAccessManager and
   QAbstractSocket. The class provides a way to pass back the required
   authentication information to the socket when accessing services that
   require authentication.
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
index fef488b29..64e9e29c4 100644
--- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp
@@ -57,7 +57,11 @@ static const int RESOLVER_TIMEOUT = 2000;
 #include <sys/types.h>
 #include <netdb.h>
 #include <arpa/inet.h>
-#include <resolv.h>
+#if defined(Q_OS_VXWORKS)
+#  include <hostLib.h>
+#else
+#  include <resolv.h>
+#endif
 
 #if defined (QT_NO_GETADDRINFO)
 #include <qmutex.h>
@@ -275,10 +279,12 @@ QHostInfo QHostInfoAgent::fromName(const QString &hostName)
             results.setError(QHostInfo::UnknownError);
             results.setErrorString(tr("Unknown address type"));
         }
+#if !defined(Q_OS_VXWORKS)
     } else if (h_errno == HOST_NOT_FOUND || h_errno == NO_DATA
                || h_errno == NO_ADDRESS) {
         results.setError(QHostInfo::HostNotFound);
         results.setErrorString(tr("Host not found"));
+#endif
     } else {
         results.setError(QHostInfo::UnknownError);
         results.setErrorString(tr("Unknown error"));
@@ -315,6 +321,7 @@ QString QHostInfo::localHostName()
 
 QString QHostInfo::localDomainName()
 {
+#if !defined(Q_OS_VXWORKS)
     resolveLibrary();
     if (local_res_ninit) {
         // using thread-safe version
@@ -344,7 +351,7 @@ QString QHostInfo::localDomainName()
             domainName = QUrl::fromAce(local_res->dnsrch[0]);
         return domainName;
     }
-
+#endif
     // nothing worked, try doing it by ourselves:
     QFile resolvconf;
 #if defined(_PATH_RESCONF)
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 608db65c3..df478fdb0 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -54,10 +54,10 @@
     QNetworkProxy provides the method for configuring network layer
     proxy support to the Qt network classes. The currently supported
     classes are QAbstractSocket, QTcpSocket, QUdpSocket, QTcpServer,
-    QHttp and QFtp. The proxy support is designed to be as transparent
-    as possible. This means that existing network-enabled applications
-    that you have written should automatically support network proxy
-    using the following code.
+    QNetworkAccessManager and QFtp. The proxy support is designed to
+    be as transparent as possible. This means that existing
+    network-enabled applications that you have written should
+    automatically support network proxy using the following code.
 
     \snippet doc/src/snippets/code/src_network_kernel_qnetworkproxy.cpp 0
 
@@ -160,8 +160,7 @@
     \row
         \o Caching-only HTTP
         \o Implemented using normal HTTP commands, it is useful only
-           in the context of HTTP requests (see QHttp,
-           QNetworkAccessManager)
+           in the context of HTTP requests (see QNetworkAccessManager)
         \o CachingCapability, HostNameLookupCapability
 
     \row