diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2018-01-30 09:28:23 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2018-02-08 12:55:47 +0200 |
| commit | fff2c98f4a7d8e4e903232b08f72aeffd5e0cda1 (patch) | |
| tree | 901763a343a2085b6c21c314f1b789290ceaeb63 /src/libs/installer/packagemanagerproxyfactory.cpp | |
| parent | 0797935d299d0da007cae0ab89ee9ceadc41d670 (diff) | |
| parent | e6c28c7fe32de1dca539c987e1c0a26f48ab0483 (diff) | |
Merge remote-tracking branch 'origin/3.0' into master
Change-Id: I8d0c8b9faa9537b50e989ec264ed7bfe8d2e358b
Diffstat (limited to 'src/libs/installer/packagemanagerproxyfactory.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagerproxyfactory.cpp | 7 |
1 files changed, 0 insertions, 7 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(); |