diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-04 05:41:28 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-04 05:41:28 (GMT) |
| commit | 049447d37d27c461c34d7ff52be2054ecd3208e3 (patch) | |
| tree | d89147cca20f077c5fe8623492e9232b1c62805a /src/network | |
| parent | 699491a8c7d9a7a2527c467e901f252f83733376 (diff) | |
| parent | 0429ed6c8a5f679444ca87bdcbdfb0093d7699a3 (diff) | |
| download | Qt-049447d37d27c461c34d7ff52be2054ecd3208e3.zip Qt-049447d37d27c461c34d7ff52be2054ecd3208e3.tar.gz Qt-049447d37d27c461c34d7ff52be2054ecd3208e3.tar.bz2 | |
Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration:
Clarified sendCustomRequest documentation to include HTTPS
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 2 |
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() */ |