Merge commit 'origin/master' into 4.6-merged

Conflicts:
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/tools/qdumper.cpp
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget_p.h
	src/gui/kernel/qwidget_s60.cpp
	src/gui/text/qfontdatabase.cpp
	src/network/access/qnetworkreplyimpl.cpp
	src/sql/drivers/ibase/qsql_ibase.cpp
	src/testlib/qtestcase.cpp
	src/testlib/testlib.pro
	tests/auto/network-settings.h
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qobjectrace/tst_qobjectrace.cpp
	tests/auto/qsqldatabase/tst_qsqldatabase.cpp
	tools/configure/configureapp.cpp
	translations/qt_ru.ts

7 files changed, 13 insertions, 11 deletions

diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp
index 1085640..827681f 100644
--- a/src/network/access/qhttpnetworkconnection.cpp
+++ b/src/network/access/qhttpnetworkconnection.cpp
@@ -148,7 +148,9 @@ int QHttpNetworkConnectionPrivate::indexOf(QAbstractSocket *socket) const
     for (int i = 0; i < channelCount; ++i)
         if (channels[i].socket == socket)
             return i;
-    return -1;
+
+    qFatal("Called with unknown socket object.");
+    return 0;
 }
 
 bool QHttpNetworkConnectionPrivate::isSocketBusy(QAbstractSocket *socket) const
@@ -599,7 +601,7 @@ void QHttpNetworkConnectionPrivate::receiveReply(QAbstractSocket *socket, QHttpN
                 // try to reconnect/resend before sending an error.
                 if (channels[i].reconnectAttempts-- > 0) {
                     resendCurrentRequest(socket);
-                } else {
+                } else if (reply) {
                     reply->d_func()->errorString = errorDetail(QNetworkReply::RemoteHostClosedError, socket);
                     emit reply->finishedWithError(QNetworkReply::RemoteHostClosedError, reply->d_func()->errorString);
                     QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection);
@@ -917,6 +919,7 @@ void QHttpNetworkConnectionPrivate::createAuthorization(QAbstractSocket *socket,
     Q_ASSERT(socket);
 
     int i = indexOf(socket);
+
     if (channels[i].authMehtod != QAuthenticatorPrivate::None) {
         if (!(channels[i].authMehtod == QAuthenticatorPrivate::Ntlm && channels[i].lastStatus != 401)) {
             QAuthenticatorPrivate *priv = QAuthenticatorPrivate::getPrivate(channels[i].authenticator);
@@ -1391,7 +1394,8 @@ void QHttpNetworkConnectionPrivate::_q_encrypted()
     QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(q->sender());
     if (!socket)
         return; // ### error
-    channels[indexOf(socket)].state = IdleState;
+    int i = indexOf(socket);
+    channels[i].state = IdleState;
     sendRequest(socket);
 }
 
diff --git a/src/network/access/qhttpnetworkconnection_p.h b/src/network/access/qhttpnetworkconnection_p.h
index 3d92cf9..a0813d4 100644
--- a/src/network/access/qhttpnetworkconnection_p.h
+++ b/src/network/access/qhttpnetworkconnection_p.h
@@ -243,7 +243,8 @@ public:
         bool ignoreSSLErrors;
 #endif
         Channel() : socket(0), state(IdleState), reply(0), written(0), bytesTotal(0), resendCurrent(false),
-            reconnectAttempts(2), authMehtod(QAuthenticatorPrivate::None), proxyAuthMehtod(QAuthenticatorPrivate::None)
+            lastStatus(0), pendingEncrypt(false), reconnectAttempts(2),
+            authMehtod(QAuthenticatorPrivate::None), proxyAuthMehtod(QAuthenticatorPrivate::None)
 #ifndef QT_NO_OPENSSL
             , ignoreSSLErrors(false)
 #endif
diff --git a/src/network/access/qhttpnetworkreply.cpp b/src/network/access/qhttpnetworkreply.cpp
index 72aec99..ef4a865 100644
--- a/src/network/access/qhttpnetworkreply.cpp
+++ b/src/network/access/qhttpnetworkreply.cpp
@@ -479,8 +479,6 @@ bool QHttpNetworkReplyPrivate::parseStatus(const QByteArray &status)
 qint64 QHttpNetworkReplyPrivate::readHeader(QAbstractSocket *socket)
 {
     qint64 bytes = 0;
-    char crlfcrlf[5];
-    crlfcrlf[4] = '\0';
     char c = 0;
     bool allHeaders = false;
     while (!allHeaders && socket->bytesAvailable()) {
diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp
index d1dbdc9..6eacdf1 100644
--- a/src/network/access/qnetworkreplyimpl.cpp
+++ b/src/network/access/qnetworkreplyimpl.cpp
@@ -58,6 +58,7 @@ inline QNetworkReplyImplPrivate::QNetworkReplyImplPrivate()
       cacheEnabled(false), cacheSaveDevice(0),
       notificationHandlingPaused(false),
       bytesDownloaded(0), lastBytesDownloaded(-1), bytesUploaded(-1),
+      httpStatusCode(0),
       state(Idle)
 {
 }
@@ -90,7 +91,7 @@ void QNetworkReplyImplPrivate::_q_startOperation()
 void QNetworkReplyImplPrivate::_q_copyReadyRead()
 {
     Q_Q(QNetworkReplyImpl);
-    if (!copyDevice && !q->isOpen())
+    if (!copyDevice || !q->isOpen())
         return;
 
     forever {
diff --git a/src/network/kernel/qhostinfo_unix.cpp b/src/network/kernel/qhostinfo_unix.cpp
index 6820d53..876d167 100644
--- a/src/network/kernel/qhostinfo_unix.cpp
+++ b/src/network/kernel/qhostinfo_unix.cpp
@@ -41,8 +41,6 @@
 
 //#define QHOSTINFO_DEBUG
 
-static const int RESOLVER_TIMEOUT = 2000;
-
 #include "qplatformdefs.h"
 
 #include "qhostinfo_p.h"
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp
index 1d968c2..608db65 100644
--- a/src/network/kernel/qnetworkproxy.cpp
+++ b/src/network/kernel/qnetworkproxy.cpp
@@ -366,7 +366,7 @@ static QNetworkProxy::Capabilities defaultCapabilitiesForType(QNetworkProxy::Pro
          int(QNetworkProxy::HostNameLookupCapability)),
     };
 
-    if (int(type) < 0 && int(type) > int(QNetworkProxy::FtpCachingProxy))
+    if (int(type) < 0 || int(type) > int(QNetworkProxy::FtpCachingProxy))
         type = QNetworkProxy::DefaultProxy;
     return QNetworkProxy::Capabilities(defaults[int(type)]);
 }
diff --git a/src/network/socket/qlocalserver_tcp.cpp b/src/network/socket/qlocalserver_tcp.cpp
index b248f2f..bcf822e 100644
--- a/src/network/socket/qlocalserver_tcp.cpp
+++ b/src/network/socket/qlocalserver_tcp.cpp
@@ -92,7 +92,7 @@ void QLocalServerPrivate::waitForNewConnection(int msec, bool *timedOut)
 {
     if (pendingConnections.isEmpty())
         tcpServer.waitForNewConnection(msec, timedOut);
-    else
+    else if (timedOut)
         *timedOut = false;
 }