diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-05-19 04:02:17 (GMT) |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-05-19 04:02:17 (GMT) |
| commit | 2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315 (patch) | |
| tree | 9eaf0842a9cd6f719e2d64866b806a84f57f8e1e /src/network | |
| parent | 730bfd80804899771b39998c5b67e604d2192ecd (diff) | |
| parent | dcfe68f66e5162f9f7a05552aa1133cdc1f0f9c3 (diff) | |
| download | Qt-2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315.zip Qt-2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315.tar.gz Qt-2fb3ec5c80a0b9d211c0168fdcd1f4fb84c9b315.tar.bz2 | |
Merge remote branch 'origin/4.6' into 4.7-from-4.6
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/access/qnetworkaccesshttpbackend_p.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h index 254907f..c4c88ae 100644 --- a/src/network/access/qnetworkaccesshttpbackend_p.h +++ b/src/network/access/qnetworkaccesshttpbackend_p.h @@ -94,8 +94,6 @@ public: #endif QNetworkCacheMetaData fetchCacheMetaData(const QNetworkCacheMetaData &metaData) const; - qint64 deviceReadData(char *buffer, qint64 maxlen); - // we return true since HTTP needs to send PUT/POST data again after having authenticated bool needsResetableUploadData() { return true; } |