diff options
| author | Tasuku Suzuki <stasuku@gmail.com> | 2013-05-13 07:53:29 +0900 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-11 05:27:31 +0200 |
| commit | 10a441e3b1cbebb6128caa79b8edf915d1182607 (patch) | |
| tree | 07da054588ecc4ea4f7b67149023a75ffb9f2f03 /tools | |
| parent | 53bdf7daa1c598082dfde8bfbf40709f37f866e6 (diff) | |
Make qtdeclarative compile with QT_NO_NETWORKPROXY
Change-Id: Ie7bf1e1d15da323f901f2c6b851a7b1e8ae0d832
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlprofiler/qqmldebugclient.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/qmlprofiler/qqmldebugclient.cpp b/tools/qmlprofiler/qqmldebugclient.cpp index bb57594a3b..3ba8b334ff 100644 --- a/tools/qmlprofiler/qqmldebugclient.cpp +++ b/tools/qmlprofiler/qqmldebugclient.cpp @@ -308,7 +308,9 @@ void QQmlDebugConnection::flush() void QQmlDebugConnection::connectToHost(const QString &hostName, quint16 port) { QTcpSocket *socket = new QTcpSocket(d); +#ifndef QT_NO_NETWORKPROXY socket->setProxy(QNetworkProxy::NoProxy); +#endif d->device = socket; d->connectDeviceSignals(); d->gotHello = false; |