diff options
| author | artoka <arto.katajasalo@digia.com> | 2011-12-13 13:06:03 (GMT) |
|---|---|---|
| committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:25:08 (GMT) |
| commit | 45bdaac4636b69ddbae446ec65082a90290dda52 (patch) | |
| tree | 42ebdbee0b784783ceaf53a9d1b38948b8add90c /src/network/kernel | |
| parent | 08e5e81d5ebece3eb3f489d438e2cea5d4adcb4f (diff) | |
| download | Qt-45bdaac4636b69ddbae446ec65082a90290dda52.zip Qt-45bdaac4636b69ddbae446ec65082a90290dda52.tar.gz Qt-45bdaac4636b69ddbae446ec65082a90290dda52.tar.bz2 | |
Various qt documentation fixes (wk 44)
Fixes for bugs: QTBUG-13362, QTBUG-15738, QTBUG-15921,
QTBUG-18356, QTBUG-18417, QTBUG-18664, QTBUG-21562, QTBUG-22094,
and QTBUG-18741.
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index c097ed9..9b7a9f5 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -1226,7 +1226,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact /*! \fn QList<QNetworkProxy> QNetworkProxyFactory::queryProxy(const QNetworkProxyQuery &query) - This function examines takes the query request, \a query, + This function takes the query request, \a query, examines the details of the type of socket or request and returns a list of QNetworkProxy objects that indicate the proxy servers to be used, in order of preference. @@ -1247,7 +1247,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact /*! \fn QList<QNetworkProxy> QNetworkProxyFactory::systemProxyForQuery(const QNetworkProxyQuery &query) - This function examines takes the query request, \a query, + This function takes the query request, \a query, examines the details of the type of socket or request and returns a list of QNetworkProxy objects that indicate the proxy servers to be used, in order of preference. @@ -1293,7 +1293,7 @@ void QNetworkProxyFactory::setApplicationProxyFactory(QNetworkProxyFactory *fact */ /*! - This function examines takes the query request, \a query, + This function takes the query request, \a query, examines the details of the type of socket or request and returns a list of QNetworkProxy objects that indicate the proxy servers to be used, in order of preference. |