diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-12 14:37:41 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-11-12 14:46:39 (GMT) |
| commit | d1674f5c630bbb86acf1fe11a0d7c18cb79b3908 (patch) | |
| tree | 804b089514aa271ae1f6e8e598a6014a133e3460 /src/network/access | |
| parent | 437e83e7707516129f68ee26aca5349845b7cc7b (diff) | |
| download | Qt-d1674f5c630bbb86acf1fe11a0d7c18cb79b3908.zip Qt-d1674f5c630bbb86acf1fe11a0d7c18cb79b3908.tar.gz Qt-d1674f5c630bbb86acf1fe11a0d7c18cb79b3908.tar.bz2 | |
Fix compilation after merge.
Also fix a warning
Diffstat (limited to 'src/network/access')
| -rw-r--r-- | src/network/access/qhttpnetworkconnection.cpp | 2 | ||||
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 1ce162c..a1c7cf1 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -328,8 +328,6 @@ bool QHttpNetworkConnectionPrivate::handleAuthenticateChallenge(QAbstractSocket Q_ASSERT(socket); Q_ASSERT(reply); - Q_Q(QHttpNetworkConnection); - resend = false; //create the response header to be used with QAuthenticatorPrivate. QList<QPair<QByteArray, QByteArray> > fields = reply->header(); diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index ade3fe7..97e7928 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -53,6 +53,7 @@ #include "qnetworkaccessftpbackend_p.h" #include "qnetworkaccessfilebackend_p.h" #include "qnetworkaccessdebugpipebackend_p.h" +#include "qnetworkaccesscachebackend_p.h" #include "qnetworkreplydataimpl_p.h" #include "qnetworkreplyfileimpl_p.h" |