diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 01:14:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-26 01:14:19 (GMT) |
| commit | 7505a5a19c87bc58028ab18eb60a6f369fabc20b (patch) | |
| tree | bd6eac44769dff3ead80a9713882f8c85ed8f0b6 /src/network/access/qnetworkaccesshttpbackend_p.h | |
| parent | 2c0c3a213d44ad53023a507e19d18d1e5d359aec (diff) | |
| parent | 4ab8b588256cfd12c32e166cf15d4ede050222fb (diff) | |
| download | Qt-7505a5a19c87bc58028ab18eb60a6f369fabc20b.zip Qt-7505a5a19c87bc58028ab18eb60a6f369fabc20b.tar.gz Qt-7505a5a19c87bc58028ab18eb60a6f369fabc20b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix a missing error-signal when a server is shut down while downloading
Ensure that if this is does not have a valid filter when on XP or less
HTTP backend: fix build without Qt3 support
QNetworkAccessManager: enable synchronous HTTP calls
Diffstat (limited to 'src/network/access/qnetworkaccesshttpbackend_p.h')
| -rw-r--r-- | src/network/access/qnetworkaccesshttpbackend_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/network/access/qnetworkaccesshttpbackend_p.h b/src/network/access/qnetworkaccesshttpbackend_p.h index 5de3429..cc2f9ac 100644 --- a/src/network/access/qnetworkaccesshttpbackend_p.h +++ b/src/network/access/qnetworkaccesshttpbackend_p.h @@ -99,6 +99,8 @@ public: bool canResume() const; void setResumeOffset(quint64 offset); + virtual bool processRequestSynchronously(); + private slots: void replyReadyRead(); void replyFinished(); @@ -111,7 +113,7 @@ private slots: private: QHttpNetworkReply *httpReply; - QPointer<QNetworkAccessCachedHttpConnection> http; + QPointer<QHttpNetworkConnection> http; QByteArray cacheKey; QNetworkAccessBackendUploadIODevice *uploadDevice; |