diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-16 11:29:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-16 11:29:33 (GMT) |
| commit | 7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a (patch) | |
| tree | 70d18fe3ca5ac8e53410fc2b62d08fa80d88e09a /src/network/kernel/qnetworkproxy.cpp | |
| parent | 26bc8a57fd35a106dad115b842a18cb971df4cd0 (diff) | |
| parent | 540222f0d936a48f57ed36496fcb211cc437cb1b (diff) | |
| download | Qt-7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a.zip Qt-7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a.tar.gz Qt-7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-doc-team:
Doc: Fixed qdoc warnings.
Doc: Fixed qdoc warnings.
Diffstat (limited to 'src/network/kernel/qnetworkproxy.cpp')
| -rw-r--r-- | src/network/kernel/qnetworkproxy.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/network/kernel/qnetworkproxy.cpp b/src/network/kernel/qnetworkproxy.cpp index 6d4df44..71d61a4 100644 --- a/src/network/kernel/qnetworkproxy.cpp +++ b/src/network/kernel/qnetworkproxy.cpp @@ -1197,6 +1197,11 @@ void QNetworkProxyQuery::setUrl(const QUrl &url) } #ifndef QT_NO_BEARERMANAGEMENT +/*! + Returns the network configuration of the proxy query. + + \sa setNetworkConfiguration() +*/ QNetworkConfiguration QNetworkProxyQuery::networkConfiguration() const { return d ? d->config : QNetworkConfiguration(); @@ -1214,7 +1219,7 @@ QNetworkConfiguration QNetworkProxyQuery::networkConfiguration() const you should first start the QNetworkSession and obtain the active configuration from its properties. - \sa networkConfiguration + \sa networkConfiguration() */ void QNetworkProxyQuery::setNetworkConfiguration(const QNetworkConfiguration &networkConfiguration) { |