diff options
| author | Peter Yard <peter.yard@nokia.com> | 2010-12-22 06:04:57 (GMT) |
|---|---|---|
| committer | Peter Yard <peter.yard@nokia.com> | 2010-12-22 06:04:57 (GMT) |
| commit | 53b018a42813e44787aa1edc35d59feaa86cf9d7 (patch) | |
| tree | 7cce8f18faf26a87cfb5f27d1417c2a2ec86470c /src/network/access/qhttpnetworkconnectionchannel_p.h | |
| parent | 55c32b91a298d52bd7c29968d21b4b7a5ee741e4 (diff) | |
| parent | afa22a20c1b89960b647b0e3a9dc390fe6f87eae (diff) | |
| download | Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.zip Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.gz Qt-53b018a42813e44787aa1edc35d59feaa86cf9d7.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/network/access/qhttpnetworkconnectionchannel_p.h')
| -rw-r--r-- | src/network/access/qhttpnetworkconnectionchannel_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/network/access/qhttpnetworkconnectionchannel_p.h b/src/network/access/qhttpnetworkconnectionchannel_p.h index fd18042..e1d42fb 100644 --- a/src/network/access/qhttpnetworkconnectionchannel_p.h +++ b/src/network/access/qhttpnetworkconnectionchannel_p.h @@ -105,6 +105,7 @@ public: qint64 bytesTotal; bool resendCurrent; int lastStatus; // last status received on this channel + QNetworkReply::NetworkError unhandledError; // Stored code of an unhandled error. bool pendingEncrypt; // for https (send after encrypted) int reconnectAttempts; // maximum 2 reconnection attempts QAuthenticatorPrivate::Method authMethod; |