diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2018-01-25 12:05:57 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2018-01-25 10:56:34 +0000 |
| commit | c0ac15295e22ba6c3fdd403bad5a179af163575b (patch) | |
| tree | 3230ea37016b52b3d439a95de8c4703f629f5881 | |
| parent | e3ddb89442eeb6a085456363216b982e466f9626 (diff) | |
Remove http_proxy environment usage
From Qt 4.8 onwards Qt automatically uses http_proxy environment
variable.
Change-Id: Ib7b3df96beeed14da86c1b17aa2402a9809f3983
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| -rw-r--r-- | src/libs/installer/packagemanagerproxyfactory.cpp | 7 | ||||
| -rw-r--r-- | src/sdk/main.cpp | 9 |
2 files changed, 0 insertions, 16 deletions
diff --git a/src/libs/installer/packagemanagerproxyfactory.cpp b/src/libs/installer/packagemanagerproxyfactory.cpp index 98aef7d9a..93135aa1f 100644 --- a/src/libs/installer/packagemanagerproxyfactory.cpp +++ b/src/libs/installer/packagemanagerproxyfactory.cpp @@ -62,13 +62,6 @@ QList<QNetworkProxy> PackageManagerProxyFactory::queryProxy(const QNetworkProxyQ QList<QNetworkProxy> list; if (settings.proxyType() == Settings::SystemProxy) { -#if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) - QUrl proxyUrl = QUrl::fromUserInput(QString::fromUtf8(qgetenv("http_proxy"))); - if (proxyUrl.isValid()) { - return list << QNetworkProxy(QNetworkProxy::HttpProxy, proxyUrl.host(), proxyUrl.port(), - proxyUrl.userName(), proxyUrl.password()); - } -#endif QList<QNetworkProxy> systemProxies = systemProxyForQuery(query); auto proxyIter = systemProxies.begin(); diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp index 4485d9ce2..819d512c2 100644 --- a/src/sdk/main.cpp +++ b/src/sdk/main.cpp @@ -200,16 +200,7 @@ int main(int argc, char *argv[]) if (parser.isSet(QLatin1String(CommandLineOptions::Proxy))) { // Make sure we honor the system's proxy settings -#if defined(Q_OS_UNIX) && !defined(Q_OS_OSX) - QUrl proxyUrl(QString::fromLatin1(qgetenv("http_proxy"))); - if (proxyUrl.isValid()) { - QNetworkProxy proxy(QNetworkProxy::HttpProxy, proxyUrl.host(), proxyUrl.port(), - proxyUrl.userName(), proxyUrl.password()); - QNetworkProxy::setApplicationProxy(proxy); - } -#else QNetworkProxyFactory::setUseSystemConfiguration(true); -#endif } if (parser.isSet(QLatin1String(CommandLineOptions::NoProxy))) |