summaryrefslogtreecommitdiffstats
path: root/src/sdk/commandlineparser.cpp
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@qt.io>2018-01-22 15:36:20 +0200
committerKatja Marttila <katja.marttila@qt.io>2018-01-25 10:53:20 +0000
commit17884d41ae731b5119f4ba35d9b15b994a80b6e1 (patch)
tree68e0720f7f2c42a91f99c9c68ccc4bd5b03e3d39 /src/sdk/commandlineparser.cpp
parent9d00a5a957722167e55abfe7f329ea40ab31e4df (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/commandlineparser.cpp')
-rw-r--r--src/sdk/commandlineparser.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/sdk/commandlineparser.cpp b/src/sdk/commandlineparser.cpp
index fbaa91328..2f1568786 100644
--- a/src/sdk/commandlineparser.cpp
+++ b/src/sdk/commandlineparser.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.
@@ -53,6 +53,9 @@ CommandLineParser::CommandLineParser()
m_parser.addOption(QCommandLineOption(QLatin1String(CommandLineOptions::Proxy),
QLatin1String("Use system proxy on Windows and Linux. This option has no effect on OS X.")));
+ m_parser.addOption(QCommandLineOption(QLatin1String(CommandLineOptions::NoProxy),
+ QLatin1String("Do not use system proxy.")));
+
m_parser.addOption(QCommandLineOption(QLatin1String(CommandLineOptions::Script),
QLatin1String("Execute the script given as argument."), QLatin1String("file")));