diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-23 11:07:33 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-23 11:07:33 (GMT) |
| commit | 090b9eb37f067b28ff667dc2f84022fa2664902a (patch) | |
| tree | cac896b0336fdffe802a97ccd483cf97176de3a3 /src/network/access/qhttpnetworkconnectionchannel_p.h | |
| parent | af5cda49d5b6fa22e1cb1567ac874787e31a87c2 (diff) | |
| parent | e1ac82f713ab2a766ae518f3ec7a7f76689acb48 (diff) | |
| download | Qt-090b9eb37f067b28ff667dc2f84022fa2664902a.zip Qt-090b9eb37f067b28ff667dc2f84022fa2664902a.tar.gz Qt-090b9eb37f067b28ff667dc2f84022fa2664902a.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:
Improve docs for QTEST_MAIN macro.
Work around an apparent GCC optimiser bug accessing arrays beyond end
Do not crash in case a future version of libdbus has a new kind of message.
Docs: QTBUG-9150 Incorrect snippet in class doc.
tst_headers: make failure more detailed when failing to open a file
Fix number of chapters in qtestlib tutorial.
Fixed QStatusBar not to repaint itself too early
QNAM HTTP: Fix missing error() signal
Make it clear which security updates are needed for Visual Studio 2005.
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; |