summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2011-04-04 00:17:51 (GMT)
committerBea Lam <bea.lam@nokia.com>2011-04-04 01:15:55 (GMT)
commit4391e2a1c35a53cc5f116926a1e5177e9ee4f51e (patch)
treefc1045ac7818d5cc3541fe3489887712c52076a2
parent05f3920562e7a718492bed61a48c0058b65a0d5d (diff)
downloadQt-4391e2a1c35a53cc5f116926a1e5177e9ee4f51e.zip
Qt-4391e2a1c35a53cc5f116926a1e5177e9ee4f51e.tar.gz
Qt-4391e2a1c35a53cc5f116926a1e5177e9ee4f51e.tar.bz2
XmlListModel should allow types other than application/xml
application/xml is the most appropriate content type but some servers may use other types, e.g. text/xml, so allow */* as a fallback. Task-number: QTBUG-18005 Change-Id: I0442148233e06aacb2cbfaaf7ae624ba733d5f9a Reviewed-by: Michael Brasser
-rw-r--r--src/declarative/util/qdeclarativexmllistmodel.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/util/qdeclarativexmllistmodel.cpp b/src/declarative/util/qdeclarativexmllistmodel.cpp
index 5af53e6..c79baa4 100644
--- a/src/declarative/util/qdeclarativexmllistmodel.cpp
+++ b/src/declarative/util/qdeclarativexmllistmodel.cpp
@@ -919,7 +919,7 @@ void QDeclarativeXmlListModel::reload()
} else {
d->notifyQueryStarted(true);
QNetworkRequest req(d->src);
- req.setRawHeader("Accept", "application/xml");
+ req.setRawHeader("Accept", "application/xml,*/*");
d->reply = qmlContext(this)->engine()->networkAccessManager()->get(req);
QObject::connect(d->reply, SIGNAL(finished()), this, SLOT(requestFinished()));
QObject::connect(d->reply, SIGNAL(downloadProgress(qint64,qint64)),