From 38bbbca498e24e2e1e6acfa4c1fd2c4cd3826671 Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Mon, 24 Jun 2013 18:47:02 +0000 Subject: [PATCH] Qt5 seems to use env vars for system proxies, so no need for Cantata to do this for Qt5 builds. --- network/networkproxyfactory.cpp | 4 ++-- network/networkproxyfactory.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/network/networkproxyfactory.cpp b/network/networkproxyfactory.cpp index d77d07e74..ebba36819 100644 --- a/network/networkproxyfactory.cpp +++ b/network/networkproxyfactory.cpp @@ -34,7 +34,7 @@ NetworkProxyFactory::NetworkProxyFactory() , type(QNetworkProxy::HttpProxy) , port(8080) { - #ifdef Q_OS_LINUX + #if defined Q_OS_LINUX && QT_VERSION < 0x050000 // Linux uses environment variables to pass proxy configuration information, // which systemProxyForQuery doesn't support for some reason. @@ -89,7 +89,7 @@ QList NetworkProxyFactory::queryProxy(const QNetworkProxyQuery& q switch (mode) { case Mode_System: - #ifdef Q_OS_LINUX + #if defined Q_OS_LINUX && QT_VERSION < 0x050000 Q_UNUSED(query); if (envUrl.isEmpty()) { diff --git a/network/networkproxyfactory.h b/network/networkproxyfactory.h index 9a3ce420a..58f6e54d5 100644 --- a/network/networkproxyfactory.h +++ b/network/networkproxyfactory.h @@ -56,7 +56,7 @@ private: int port; QString username; QString password; - #ifdef Q_OS_LINUX + #if defined Q_OS_LINUX && QT_VERSION < 0x050000 QUrl envUrl; #endif };