diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-05 09:31:14 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-05 09:31:14 (GMT) |
| commit | bbaf34b1f5ac4e6d425eab183112b504b9ed4e83 (patch) | |
| tree | c7515ca8328a2586ddb863a67858adf67d7344df /src/network/access/qnetworkaccessmanager.cpp | |
| parent | e127c615b2f046e9c3ba82e89db1f59d7ac48e8b (diff) | |
| parent | d9072d54d094ff844dd39801b1e388138b9c8f08 (diff) | |
| download | Qt-bbaf34b1f5ac4e6d425eab183112b504b9ed4e83.zip Qt-bbaf34b1f5ac4e6d425eab183112b504b9ed4e83.tar.gz Qt-bbaf34b1f5ac4e6d425eab183112b504b9ed4e83.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM: Rename QFileNetworkReply to QNetworkReplyFileImpl
Diffstat (limited to 'src/network/access/qnetworkaccessmanager.cpp')
| -rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp index 86b1c66..9738a4f 100644 --- a/src/network/access/qnetworkaccessmanager.cpp +++ b/src/network/access/qnetworkaccessmanager.cpp @@ -54,7 +54,7 @@ #include "qnetworkaccessfilebackend_p.h" #include "qnetworkaccessdatabackend_p.h" #include "qnetworkaccessdebugpipebackend_p.h" -#include "qfilenetworkreply_p.h" +#include "qnetworkreplyfileimpl_p.h" #include "QtCore/qbuffer.h" #include "QtCore/qurl.h" @@ -952,7 +952,7 @@ QNetworkReply *QNetworkAccessManager::createRequest(QNetworkAccessManager::Opera // The QNetworkAccessFileBackend will right now only be used for PUT if ((op == QNetworkAccessManager::GetOperation || op == QNetworkAccessManager::HeadOperation) && (isLocalFile || req.url().scheme() == QLatin1String("qrc"))) { - return new QFileNetworkReply(this, req, op); + return new QNetworkReplyFileImpl(this, req, op); } #ifndef QT_NO_BEARERMANAGEMENT |