diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-13 11:58:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-13 11:58:08 (GMT) |
| commit | 0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9 (patch) | |
| tree | 046ad0fdf693107efb75a0ecd03f6cbc3dd00680 /src/network/access/qhttpnetworkreply_p.h | |
| parent | c2c69c117407990e5c2d8900f4aa27979273084a (diff) | |
| parent | a18ebd2a70e83863bc9a8cc64a65791a6d879f02 (diff) | |
| download | Qt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.zip Qt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.tar.gz Qt-0a74bc2ce91e8c7a10ae54fd0f80814902fa5de9.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
Diffstat (limited to 'src/network/access/qhttpnetworkreply_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkreply_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index 238a1da..cc5cce8 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -154,7 +154,7 @@ public: QHttpNetworkReplyPrivate(const QUrl &newUrl = QUrl()); ~QHttpNetworkReplyPrivate(); qint64 readStatus(QAbstractSocket *socket); - void parseStatus(const QByteArray &status); + bool parseStatus(const QByteArray &status); qint64 readHeader(QAbstractSocket *socket); void parseHeader(const QByteArray &header); qint64 readBody(QAbstractSocket *socket, QIODevice *out); |