summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeonard Lee <leonard.lee@digia.com>2013-01-17 15:04:16 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-01-17 16:30:34 +0100
commita303165285ae6d6651e76a684265035836b547c0 (patch)
tree2d49939b24a8184125ebb42ecaadf401d83b61b0
parent88966515993773e4d7d6276bce6fccfcc13ab6f4 (diff)
Add missing -system-proxies configure option.
This task is valid for Qt 4 only. Under Qt 5, the "Configuration Option for Qt" documentation page removed by https://codereview.qt-project.org/40852 commit. Use 'configure -help' to see all available options. Task-number: QTBUG-2069 Change-Id: Idd98208338549a0c62d80c35b5eac45b6bfd6db4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--doc/src/getting-started/installation.qdoc3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/src/getting-started/installation.qdoc b/doc/src/getting-started/installation.qdoc
index 3ee0e2357b..d3d911c8a1 100644
--- a/doc/src/getting-started/installation.qdoc
+++ b/doc/src/getting-started/installation.qdoc
@@ -1444,6 +1444,9 @@ We hope you will enjoy using Qt.
\row \o \c {-xplatform <spec>} \o The operating system and compiler you
are cross compiling for. \o See the README file for a list of supported
operating systems and compilers.
+ \row \o \c {-system-proxies} \o Use system network proxies by default. \o
+ \row \o \c {-no-system-proxies} \o Do not use system network proxies
+ by default. \o
\row \o \c {-qtnamespace <namespace>} \o Wraps all Qt library code in
'namespace name {..} \o
\row \o \c {-qtlibinfix <infix>} \o Renames all Qt* libs to Qt*<infix>