diff options
| author | kh1 <karsten.heimrich@digia.com> | 2013-11-27 16:59:16 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2013-11-28 13:03:28 +0100 |
| commit | 78e39070593557ad4ee1b836ab3cc2035486d272 (patch) | |
| tree | 6f003a90a67429cd08878d79a39d3eef424294f0 | |
| parent | d514bdd3c1977960c4d8d469c26a7cd37ee47a62 (diff) | |
Reuse http proxy settings for https.
Change-Id: I364066264072c91dae376eb4d7e3bda70688269e
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
| -rw-r--r-- | src/libs/installer/packagemanagerproxyfactory.cpp | 6 |
1 files 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<QNetworkProxy> 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); } |