diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2018-01-22 15:36:20 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2018-01-25 10:53:20 +0000 |
| commit | 17884d41ae731b5119f4ba35d9b15b994a80b6e1 (patch) | |
| tree | 68e0720f7f2c42a91f99c9c68ccc4bd5b03e3d39 /src/sdk/main.cpp | |
| parent | 9d00a5a957722167e55abfe7f329ea40ab31e4df (diff) | |
Add no-proxy option
From Qt 5.8 onwards system proxy is used by default. Add option --no-proxy
to enable installer usage with no proxy.
Task-number: QTIFW-1085
Change-Id: If5247969aa9577cb746468c59802104d19826596
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/sdk/main.cpp')
| -rw-r--r-- | src/sdk/main.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/sdk/main.cpp b/src/sdk/main.cpp index 46165b214..4485d9ce2 100644 --- a/src/sdk/main.cpp +++ b/src/sdk/main.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2017 The Qt Company Ltd. +** Copyright (C) 2018 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -212,6 +212,9 @@ int main(int argc, char *argv[]) #endif } + if (parser.isSet(QLatin1String(CommandLineOptions::NoProxy))) + QNetworkProxyFactory::setUseSystemConfiguration(false); + if (parser.isSet(QLatin1String(CommandLineOptions::CheckUpdates))) return UpdateChecker(argc, argv).check(); |