feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDebugging: Fix on-device debugging for people with a default proxy

Browse Source 
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:
Kai Koehne
2011-08-11 09:57:44 +02:00
parent 52b7b58542
commit 929d1aa042
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libs/qmljsdebugclient/qdeclarativedebugclient.cpp
View File

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