Merge remote-tracking branch 'origin/2.3'

Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd

src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp

@@ -35,6 +35,7 @@
 
 #include <QtCore/qdebug.h>
 #include <QtCore/qstringlist.h>
+#include <QtNetwork/qnetworkproxy.h>
 #include <symbiandevicemanager.h>
 
 namespace QmlJsDebugClient {
@@ -286,6 +287,7 @@ void QDeclarativeDebugConnection::flush()
 void QDeclarativeDebugConnection::connectToHost(const QString &hostName, quint16 port)
 {
     QTcpSocket *socket = new QTcpSocket(d);
+    socket->setProxy(QNetworkProxy::NoProxy);
     d->device = socket;
     d->connectDeviceSignals();
     d->gotHello = false;