diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 23:59:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-03 23:59:48 (GMT) |
| commit | 6f2d27fd686f5cef0dc52f220ffeeded529d2793 (patch) | |
| tree | f272e4dad3301cfdc52e6d6fd3c6e342ecc0475f /src/network/access/qhttpnetworkconnectionchannel_p.h | |
| parent | a9fa8187b1a7efe343e0bf2722cde5c0ef5fa77e (diff) | |
| parent | 9962e2d96a212c518054220167eb6f61e1052bcc (diff) | |
| download | Qt-6f2d27fd686f5cef0dc52f220ffeeded529d2793.zip Qt-6f2d27fd686f5cef0dc52f220ffeeded529d2793.tar.gz Qt-6f2d27fd686f5cef0dc52f220ffeeded529d2793.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Autotest: to be sure, generate .cpp files with the proper headers too
Fix regression in clipped icon text on Windows
Fixed QFileInfo::absolutePath() warning when running "qmake -project"
QTcpServer: Clarify thread affinity of incoming QTcpSocket
Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.
Updated my changelog entry
QNAM HTTP: Fix bug related to re-sending a request
Adding my changes.
Remove erroneous warning in QFileInfo::absolutePath()
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index c30c236..75ab50d 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -151,6 +151,8 @@ public: void allDone(); // reply header + body have been read void handleStatus(); // called from allDone() + bool resetUploadData(); // return true if resetting worked or there is no upload data + void pipelineInto(HttpMessagePair &pair); void requeueCurrentlyPipelinedRequests(); void detectPipeliningSupport(); |