Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Configure.exe recompiled with MSVC6.

Conflicts:
	configure.exe
	examples/network/network.pro
	src/gui/dialogs/qfiledialog_p.h
	src/gui/dialogs/qfilesystemmodel_p.h
	src/gui/kernel/qapplication.cpp
	tests/auto/_Categories/qmake.txt
	tests/auto/qfile/test/test.pro
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qlibrary/tst_qlibrary.cpp
	tests/auto/qline/tst_qline.cpp
	tests/auto/qstyle/tst_qstyle.cpp
	tests/auto/qtextstream/tst_qtextstream.cpp
	tests/auto/qtranslator/qtranslator.pro
	tests/auto/qwaitcondition/tst_qwaitcondition.cpp
	translations/qt_ja_JP.ts

3 files changed, 5 insertions, 5 deletions

diff --git a/src/network/kernel/qauthenticator.cpp b/src/network/kernel/qauthenticator.cpp
index 4f477bd..c9161f8 100644
--- a/src/network/kernel/qauthenticator.cpp
+++ b/src/network/kernel/qauthenticator.cpp
@@ -52,7 +52,7 @@
 
 QT_BEGIN_NAMESPACE
 
-#include <../3rdparty/des/des.cpp>
+#include "../../3rdparty/des/des.cpp"
 
 static QByteArray qNtlmPhase1();
 static QByteArray qNtlmPhase3(QAuthenticatorPrivate *ctx, const QByteArray& phase2data);
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index fc43369..b225c17 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -435,7 +435,7 @@ void QNetmaskAddress::setPrefixLength(QAbstractSocket::NetworkLayerProtocol prot
     The class also supports common predefined addresses: \l Null, \l
     LocalHost, \l LocalHostIPv6, \l Broadcast, and \l Any.
 
-    \sa QTcpSocket, QTcpServer, QUdpSocket
+    \sa QHostInfo, QTcpSocket, QTcpServer, QUdpSocket
 */
 
 /*! \enum QHostAddress::SpecialAddress
diff --git a/src/network/kernel/qnetworkinterface_win.cpp b/src/network/kernel/qnetworkinterface_win.cpp
index 9540c18..de97629 100644
--- a/src/network/kernel/qnetworkinterface_win.cpp
+++ b/src/network/kernel/qnetworkinterface_win.cpp
@@ -173,14 +173,14 @@ static QList<QNetworkInterfacePrivate *> interfaceListingWinXP()
         interfaces << iface;
 
         iface->index = 0;
-        if (ptr->Length >= offsetof(IP_ADAPTER_ADDRESSES, Ipv6IfIndex))
+        if (ptr->Length >= offsetof(IP_ADAPTER_ADDRESSES, Ipv6IfIndex) && ptr->Ipv6IfIndex != 0)
             iface->index = ptr->Ipv6IfIndex;
         else if (ptr->IfIndex != 0)
             iface->index = ptr->IfIndex;
 
         iface->flags = QNetworkInterface::CanBroadcast;
-		if (ptr->OperStatus == IfOperStatusUp)
-			iface->flags |= QNetworkInterface::IsUp | QNetworkInterface::IsRunning;
+        if (ptr->OperStatus == IfOperStatusUp)
+            iface->flags |= QNetworkInterface::IsUp | QNetworkInterface::IsRunning;
         if ((ptr->Flags & IP_ADAPTER_NO_MULTICAST) == 0)
             iface->flags |= QNetworkInterface::CanMulticast;