forked from qt-creator/qt-creator
QmlDebugging: Fix on-device debugging for people with a default proxy
Qt Creator by default honors the proxy settings of the environment. This is the wrong choice when connecting to your device, leading to 'Cannot connect to in-process debugger' errors. Change-Id: Ie0b822dec601463ba3a620efe1a1e35bb24b6c5a Reviewed-on: http://codereview.qt.nokia.com/2846 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
This commit is contained in:
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user