aboutsummaryrefslogtreecommitdiffstats
path: root/src/qmlxmllistmodel/qqmlxmllistmodel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/qmlxmllistmodel/qqmlxmllistmodel.cpp')
-rw-r--r--src/qmlxmllistmodel/qqmlxmllistmodel.cpp32
1 files changed, 8 insertions, 24 deletions
diff --git a/src/qmlxmllistmodel/qqmlxmllistmodel.cpp b/src/qmlxmllistmodel/qqmlxmllistmodel.cpp
index 95d871d7f1..b2b1d4ab33 100644
--- a/src/qmlxmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/qmlxmllistmodel/qqmlxmllistmodel.cpp
@@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE
\inqmlmodule QtQml.XmlListModel
\brief For specifying a role to an \l XmlListModel.
- \sa {All QML Types}{Qt QML}
+ \sa {All QML Types}{Qt Qml}
*/
/*!
@@ -559,14 +559,12 @@ int QQmlXmlListModel::nextQueryId()
\qmlproperty enumeration QtQml.XmlListModel::XmlListModel::status
Specifies the model loading status, which can be one of the following:
- \list
- \li XmlListModel.Null - No XML data has been set for this model.
- \li XmlListModel.Ready - The XML data has been loaded into the model.
- \li XmlListModel.Loading - The model is in the process of reading and
- loading XML data.
- \li XmlListModel.Error - An error occurred while the model was loading. See
- \l errorString() for details about the error.
- \endlist
+ \value XmlListModel.Null No XML data has been set for this model.
+ \value XmlListModel.Ready The XML data has been loaded into the model.
+ \value XmlListModel.Loading The model is in the process of reading and
+ loading XML data.
+ \value XmlListModel.Error An error occurred while the model was loading. See
+ \l errorString() for details about the error.
\sa progress
*/
@@ -596,7 +594,7 @@ qreal QQmlXmlListModel::progress() const
}
/*!
- \qmlmethod QtQuick.XmlListModel::XmlListModel::errorString()
+ \qmlmethod QtQml.XmlListModel::XmlListModel::errorString()
Returns a string description of the last error that occurred
if \l status is \l {XmlListModel}.Error.
@@ -682,23 +680,9 @@ void QQmlXmlListModel::reload()
}
}
-#define XMLLISTMODEL_MAX_REDIRECT 16
-
#if QT_CONFIG(qml_network)
void QQmlXmlListModel::requestFinished()
{
- m_redirectCount++;
- if (m_redirectCount < XMLLISTMODEL_MAX_REDIRECT) {
- QVariant redirect = m_reply->attribute(QNetworkRequest::RedirectionTargetAttribute);
- if (redirect.isValid()) {
- QUrl url = m_reply->url().resolved(redirect.toUrl());
- deleteReply();
- setSource(url);
- return;
- }
- }
- m_redirectCount = 0;
-
if (m_reply->error() != QNetworkReply::NoError) {
m_errorString = m_reply->errorString();
deleteReply();