summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-05-03 16:06:59 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-05-03 16:06:59 (GMT)
commit0429ed6c8a5f679444ca87bdcbdfb0093d7699a3 (patch)
tree9c36a23a122b7a131899818b810c33547001933b /src
parent660ebda77f6cbc4a41f45f78e18dbc892cd1c551 (diff)
parent306d4c772f18a92146c1539920f40d51ff8c306b (diff)
downloadQt-0429ed6c8a5f679444ca87bdcbdfb0093d7699a3.zip
Qt-0429ed6c8a5f679444ca87bdcbdfb0093d7699a3.tar.gz
Qt-0429ed6c8a5f679444ca87bdcbdfb0093d7699a3.tar.bz2
Merge branch 4.7 into qt-4.8-from-4.7
Diffstat (limited to 'src')
-rw-r--r--src/network/access/qnetworkaccessmanager.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index 5a7521e..0d7b52a 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -861,7 +861,7 @@ QNetworkAccessManager::NetworkAccessibility QNetworkAccessManager::networkAccess
device will be uploaded to the server; in that case, data must be open for
reading and must remain valid until the finished() signal is emitted for this reply.
- \note This feature is currently available for HTTP only.
+ \note This feature is currently available for HTTP(S) only.
\sa get(), post(), put(), deleteResource()
*/