From 78e39070593557ad4ee1b836ab3cc2035486d272 Mon Sep 17 00:00:00 2001 From: kh1 Date: Wed, 27 Nov 2013 16:59:16 +0100 Subject: Reuse http proxy settings for https. Change-Id: I364066264072c91dae376eb4d7e3bda70688269e Reviewed-by: Niels Weber Reviewed-by: Tim Jenssen --- src/libs/installer/packagemanagerproxyfactory.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/libs/installer/packagemanagerproxyfactory.cpp b/src/libs/installer/packagemanagerproxyfactory.cpp index 42f8e9893..219ff5e49 100644 --- a/src/libs/installer/packagemanagerproxyfactory.cpp +++ b/src/libs/installer/packagemanagerproxyfactory.cpp @@ -79,8 +79,10 @@ QList PackageManagerProxyFactory::queryProxy(const QNetworkProxyQ if (query.url().scheme() == QLatin1String("ftp")) return list << settings.ftpProxy(); - if (query.url().scheme() == QLatin1String("http")) - return list << settings.httpProxy(); + if ((query.url().scheme() == QLatin1String("http")) + || (query.url().scheme() == QLatin1String("https"))) { + return list << settings.httpProxy(); + } } return list << QNetworkProxy(QNetworkProxy::DefaultProxy); } -- cgit v1.2.3