diff options
author | Peter Hartmann <phartmann@rim.com> | 2012-10-23 15:31:20 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-30 00:06:26 +0100 |
commit | f7893223e84db86dcdd860c625663d7006fcdad6 (patch) | |
tree | 12f5f7c28cc730aaa59cabba93a2c39b624484ad /tools/configure/configureapp.cpp | |
parent | 3e52901641f8b3a1cce95709a2c91be59947673f (diff) |
QtNetwork: introduce configure switch to use system proxies by default
This option is opt-in (default: no). When configured with
"-proxies-system-default", Qt automatically picks up the system
proxies.
Change-Id: I8cc002f29587854f448d97117b08c43d8eedec76
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'tools/configure/configureapp.cpp')
-rw-r--r-- | tools/configure/configureapp.cpp | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 1b75def13f..113ebf7692 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -236,6 +236,7 @@ Configure::Configure(int& argc, char** argv) dictionary[ "QT_CUPS" ] = "auto"; dictionary[ "CFG_GCC_SYSROOT" ] = "yes"; dictionary[ "SLOG2" ] = "no"; + dictionary[ "SYSTEM_PROXIES" ] = "no"; //Only used when cross compiling. dictionary[ "QT_INSTALL_SETTINGS" ] = "/etc/xdg"; @@ -877,6 +878,10 @@ void Configure::parseCmdLine() dictionary[ "SLOG2" ] = "no"; } else if (configCmdLine.at(i) == "-slog2") { dictionary[ "SLOG2" ] = "yes"; + } else if (configCmdLine.at(i) == "-no-system-proxies") { + dictionary[ "SYSTEM_PROXIES" ] = "no"; + } else if (configCmdLine.at(i) == "-system-proxies") { + dictionary[ "SYSTEM_PROXIES" ] = "yes"; } // Work around compiler nesting limitation @@ -1682,6 +1687,10 @@ bool Configure::displayHelp() desc("QT_INSTALL_SETTINGS", "auto", "-sysconfdir <dir>", "Settings used by Qt programs will be looked for in\n<dir>.\n"); + 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.\n"); + + #if !defined(EVAL) desc( "-qtnamespace <name>", "Wraps all Qt library code in 'namespace name {...}'."); desc( "-qtlibinfix <infix>", "Renames all Qt* libs to Qt*<infix>.\n"); @@ -2560,6 +2569,9 @@ void Configure::generateOutputVars() if (dictionary[ "V8SNAPSHOT" ] == "yes") qtConfig += "v8snapshot"; + if (dictionary[ "SYSTEM_PROXIES" ] == "yes") + qtConfig += "system-proxies"; + // Add config levels -------------------------------------------- QStringList possible_configs = QStringList() << "minimal" @@ -3328,7 +3340,8 @@ void Configure::displayConfig() sout << "QtDBus support.............." << dictionary[ "DBUS" ] << endl; sout << "QtWidgets module support...." << dictionary[ "WIDGETS" ] << endl; sout << "QML debugging..............." << dictionary[ "QML_DEBUG" ] << endl; - sout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl << endl; + sout << "DirectWrite support........." << dictionary[ "DIRECTWRITE" ] << endl; + sout << "Use system proxies.........." << dictionary[ "SYSTEM_PROXIES" ] << endl << endl; sout << "Third Party Libraries:" << endl; sout << " ZLIB support............" << dictionary[ "ZLIB" ] << endl; |