diff options
| author | Peter Hartmann <phartmann@rim.com> | 2012-10-23 13:31:20 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-31 23:55:10 (GMT) |
| commit | d7e922e6b197193fe4a2284b5e25cfb9a4fdd278 (patch) | |
| tree | 92e0d03536a7ad35e4f006c3449577f38abb302b /tools/configure | |
| parent | 9b4bd98744623f81b7b0950e207209f0c19adb46 (diff) | |
| download | Qt-d7e922e6b197193fe4a2284b5e25cfb9a4fdd278.zip Qt-d7e922e6b197193fe4a2284b5e25cfb9a4fdd278.tar.gz Qt-d7e922e6b197193fe4a2284b5e25cfb9a4fdd278.tar.bz2 | |
QtNetwork: introduce configure switch to use system proxies by default
This option is opt-in (default: no). When configured with
"-system-proxies", Qt automatically picks up the system
proxies.
(backport of commit f7893223e84db86dcdd860c625663d7006fcdad6)
Change-Id: I95c3b17abee0691991a60a386052b4c2989f896c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 80dacb3..77174d5 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -400,6 +400,7 @@ Configure::Configure(int& argc, char** argv) dictionary[ "LTCG" ] = "no"; dictionary[ "NATIVE_GESTURES" ] = "yes"; dictionary[ "MSVC_MP" ] = "no"; + dictionary[ "SYSTEM_PROXIES" ] = "no"; } Configure::~Configure() @@ -1309,6 +1310,14 @@ void Configure::parseCmdLine() dictionary["POSIX_IPC"] = "yes"; } + else if (configCmdLine.at(i) == "-no-system-proxies") { + dictionary[ "SYSTEM_PROXIES" ] = "no"; + } + + else if (configCmdLine.at(i) == "-system-proxies") { + dictionary[ "SYSTEM_PROXIES" ] = "yes"; + } + else { dictionary[ "HELP" ] = "yes"; cout << "Unknown option " << configCmdLine.at(i) << endl; @@ -1930,6 +1939,9 @@ bool Configure::displayHelp() desc("POSIX_IPC", "yes", "-posix-ipc", "Enable POSIX IPC."); + desc("SYSTEM_PROXIES", "yes", "-system-proxies", "Use system network proxies by default."); + desc("SYSTEM_PROXIES", "no", "-no-system-proxies", "Do not use system network proxies by default."); + #if !defined(EVAL) desc( "-qtnamespace <namespace>", "Wraps all Qt library code in 'namespace name {...}"); desc( "-qtlibinfix <infix>", "Renames all Qt* libs to Qt*<infix>\n"); @@ -3000,6 +3012,9 @@ void Configure::generateOutputVars() if (dictionary["STACK_PROTECTOR_STRONG"] == "yes") qtConfig += "stack-protector-strong"; + if (dictionary["SYSTEM_PROXIES"] == "yes") + qtConfig += "system-proxies"; + // We currently have no switch for QtConcurrent, so add it unconditionally. qtConfig += "concurrent"; @@ -3759,7 +3774,8 @@ void Configure::displayConfig() cout << "QtScriptTools support......." << dictionary[ "SCRIPTTOOLS" ] << endl; cout << "Graphics System............." << dictionary[ "GRAPHICS_SYSTEM" ] << endl; cout << "Qt3 compatibility..........." << dictionary[ "QT3SUPPORT" ] << endl; - cout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl << endl; + cout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl; + cout << "Use system proxies.........." << dictionary[ "SYSTEM_PROXIES" ] << endl << endl; cout << "Third Party Libraries:" << endl; cout << " ZLIB support............" << dictionary[ "ZLIB" ] << endl; |