From: Tasuku Suzuki <stasuku@gmail.com>
Date: Sun, 12 May 2013 22:53:29 +0000 (+0900)
Subject: Make qtdeclarative compile with QT_NO_NETWORKPROXY
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=10a441e3b1cbebb6128caa79b8edf915d1182607;p=konrad%2Fqtdeclarative.git

Make qtdeclarative compile with QT_NO_NETWORKPROXY

Change-Id: Ie7bf1e1d15da323f901f2c6b851a7b1e8ae0d832
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
---

diff --git a/tools/qmlprofiler/qqmldebugclient.cpp b/tools/qmlprofiler/qqmldebugclient.cpp
index bb57594..3ba8b33 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;