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-11-01 00:55:10 +0100 |
| commit | d7e922e6b197193fe4a2284b5e25cfb9a4fdd278 (patch) | |
| tree | 92e0d03536a7ad35e4f006c3449577f38abb302b /configure | |
| parent | 9b4bd98744623f81b7b0950e207209f0c19adb46 (diff) | |
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 'configure')
| -rwxr-xr-x | configure | 21 |
1 files changed, 21 insertions, 0 deletions
@@ -916,6 +916,7 @@ CFG_COREWLAN=auto CFG_ICD=auto CFG_NOPROCESS=no CFG_ICU=auto +CFG_SYSTEM_PROXIES=no # initalize variables used for installation QT_INSTALL_PREFIX= @@ -1103,6 +1104,14 @@ while [ "$#" -gt 0 ]; do VAR=`echo $1 | sed "s,^--\(.*\),\1,"` VAL=yes ;; + -system-proxies) + VAR=system-proxies + VAL=yes + ;; + -no-system-proxies) + VAR=system-proxies + VAL=no + ;; #Qt plugin options -no-*-*|-plugin-*-*|-qt-*-*) VAR=`echo $1 | sed "s,^-[^-]*-\(.*\),\1,"` @@ -2492,6 +2501,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + system-proxies) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_SYSTEM_PROXIES="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; *) UNKNOWN_OPT=yes ;; @@ -3912,6 +3928,9 @@ Configure options: -no-largefile ...... Disables large file support. + -largefile ......... Enables Qt to access files larger than 4 GB. + * -no-system-proxies . Do not use system network proxies by default. + -system-proxies .... Use system network proxies by default. + EOF if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then EXCN="*" @@ -7312,6 +7331,7 @@ fi [ "$CFG_IWMMXT" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG iwmmxt" [ "$CFG_NEON" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG neon" [ "$PLATFORM_MAC" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG $CFG_MAC_ARCHS" +[ "$CFG_SYSTEM_PROXIES" = "yes" ] && QT_CONFIG="$QT_CONFIG system-proxies" if [ "$CFG_IPV6" = "yes" ]; then QT_CONFIG="$QT_CONFIG ipv6" fi @@ -8995,6 +9015,7 @@ if [ "$PLATFORM_MAC" = "yes" ]; then fi echo "ICD support ............ $CFG_ICD" echo "libICU support ......... $CFG_ICU" +echo "Use system proxies ..... $CFG_SYSTEM_PROXIES" echo [ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........... $CFG_PTMALLOC" |