diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2019-10-14 14:26:47 +0300 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2019-10-14 11:33:05 +0000 |
| commit | 730425abb092592e4b74e2d38f5e8a0b998966f9 (patch) | |
| tree | 600654775a90e77e766fdc0a4aa3a92af02f0241 | |
| parent | 1b96174671cd5875c72783b79625848dc717d18c (diff) | |
Fix --no-proxy option in Windows
Task-number: QTIFW-1445
Change-Id: Iad02ecda0d5b27c3c9719f7c57e090d53a249be6
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| -rw-r--r-- | src/sdk/installerbase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 8ec142950..d7f21bbd0 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -171,11 +171,11 @@ int InstallerBase::run() // From Qt5.8 onwards a separate command line option --proxy is not needed as system // proxy is used by default. If Qt is built with QT_USE_SYSTEM_PROXIES false // then system proxies are not used by default. - if ((parser.isSet(QLatin1String(CommandLineOptions::Proxy)) -#if QT_VERSION > 0x050800 - || QNetworkProxyFactory::usesSystemConfiguration() -#endif - ) && !parser.isSet(QLatin1String(CommandLineOptions::NoProxy))) { + if (parser.isSet(QLatin1String(CommandLineOptions::NoProxy))) { + m_core->settings().setProxyType(QInstaller::Settings::NoProxy); + KDUpdater::FileDownloaderFactory::instance().setProxyFactory(m_core->proxyFactory()); + } else if ((parser.isSet(QLatin1String(CommandLineOptions::Proxy)) + || QNetworkProxyFactory::usesSystemConfiguration())) { m_core->settings().setProxyType(QInstaller::Settings::SystemProxy); KDUpdater::FileDownloaderFactory::instance().setProxyFactory(m_core->proxyFactory()); } |