Merge remote-tracking branch 'origin/2.0'

Change-Id: Ia4c0c6766b52626798197c646043407df8de1fd6

1 files changed, 13 insertions, 1 deletions

diff --git a/src/libs/installer/packagemanagerproxyfactory.cpp b/src/libs/installer/packagemanagerproxyfactory.cpp
index 5e8e3188b..7626a26d4 100644
--- a/src/libs/installer/packagemanagerproxyfactory.cpp
+++ b/src/libs/installer/packagemanagerproxyfactory.cpp
@@ -75,7 +75,19 @@ QList<QNetworkProxy> PackageManagerProxyFactory::queryProxy(const QNetworkProxyQ
                 proxyUrl.userName(), proxyUrl.password());
         }
 #endif
-        return QNetworkProxyFactory::systemProxyForQuery(query);
+        QList<QNetworkProxy> systemProxies = systemProxyForQuery(query);
+
+        auto proxyIter = systemProxies.begin();
+        for (; proxyIter != systemProxies.end(); ++proxyIter) {
+            QNetworkProxy &proxy = *proxyIter;
+            auto p = std::find_if(m_proxyCredentials.constBegin(), m_proxyCredentials.constEnd(),
+                                  FindProxyCredential(proxy.hostName(), proxy.port()));
+            if (p != m_proxyCredentials.constEnd()) {
+                proxy.setUser(p->user);
+                proxy.setPassword(p->password);
+            }
+        }
+        return systemProxies;
     }
 
     if ((settings.proxyType() == Settings::NoProxy))