Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

All EGL-related changes from 4.6 were discarded.

Conflicts:
	src/gui/egl/egl.pri
	src/gui/egl/qegl.cpp
	src/gui/egl/qegl_p.h
	src/gui/egl/qegl_stub.cpp
	src/gui/egl/qeglproperties_p.h
	src/gui/egl/qeglproperties_stub.cpp
	src/gui/gui.pro
	src/multimedia/multimedia/audio/qaudioinput_win32_p.h
	src/s60installs/bwins/QtGuiu.def
	src/s60installs/eabi/QtGuiu.def

1 files changed, 7 insertions, 0 deletions

diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index 57d995a..3b7bc9e 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -317,6 +317,13 @@ void QHttpNetworkConnectionChannel::_q_receiveReply()
         return;
     }
 
+    // only run when the QHttpNetworkConnection is not currently being destructed, e.g.
+    // this function is called from _q_disconnected which is called because
+    // of ~QHttpNetworkConnectionPrivate
+    if (!qobject_cast<QHttpNetworkConnection*>(connection)) {
+        return;
+    }
+
     qint64 bytes = 0;
     QAbstractSocket::SocketState socketState = socket->state();