diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-03 08:53:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-03 08:53:13 (GMT) |
| commit | 306d4c772f18a92146c1539920f40d51ff8c306b (patch) | |
| tree | 02e5b95531785808b7e06ff81934fd661f1b9b6d | |
| parent | 78df9e39a43b21f7f0fedca11f906a2ae9df99c1 (diff) | |
| parent | 16b8c940dac02ec77e6ff9fe4150c32db1811e74 (diff) | |
| download | Qt-306d4c772f18a92146c1539920f40d51ff8c306b.zip Qt-306d4c772f18a92146c1539920f40d51ff8c306b.tar.gz Qt-306d4c772f18a92146c1539920f40d51ff8c306b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Clarified sendCustomRequest documentation to include HTTPS
| -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 5b518de..fc7c38d 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -916,7 +916,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() */ |