summaryrefslogtreecommitdiffstats
path: root/src/network/access/qnetworkrequest.cpp
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-10-09 12:13:22 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-10-09 12:13:22 (GMT)
commit9ac420db693aecd5f9f1c51f305a0148f46636ba (patch)
treec71806cf11060a752e286e220cbfcde6264d160f /src/network/access/qnetworkrequest.cpp
parentd66df793b88f9ba924a1fefcec325d7c04af3ac3 (diff)
parentfaef2f5101287ad8ce94cf8e7a4d574a7d6267fd (diff)
downloadQt-9ac420db693aecd5f9f1c51f305a0148f46636ba.zip
Qt-9ac420db693aecd5f9f1c51f305a0148f46636ba.tar.gz
Qt-9ac420db693aecd5f9f1c51f305a0148f46636ba.tar.bz2
Merge branch '4.6' of git@scm.dev.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/network/access/qnetworkrequest.cpp')
-rw-r--r--src/network/access/qnetworkrequest.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qnetworkrequest.cpp b/src/network/access/qnetworkrequest.cpp
index ca9e606..33bc57b 100644
--- a/src/network/access/qnetworkrequest.cpp
+++ b/src/network/access/qnetworkrequest.cpp
@@ -484,7 +484,7 @@ void QNetworkRequest::setSslConfiguration(const QSslConfiguration &config)
/*!
\since 4.6
- Allows setting a reference to the object initiating
+ Allows setting a reference to the \a object initiating
the request.
For example QtWebKit sets the originating object to the