summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/imports/xmllistmodel/plugins.qmltypes4
-rw-r--r--src/imports/xmllistmodel/qqmlxmllistmodel.cpp8
-rw-r--r--src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/imports/xmllistmodel/plugins.qmltypes b/src/imports/xmllistmodel/plugins.qmltypes
index 951d0b6e..39b44292 100644
--- a/src/imports/xmllistmodel/plugins.qmltypes
+++ b/src/imports/xmllistmodel/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.12'
+// 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.13'
Module {
- dependencies: ["QtQuick 2.12"]
+ dependencies: ["QtQuick 2.0"]
Component {
name: "QQuickXmlListModel"
defaultProperty: "roles"
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index ba8d9488..8455853a 100644
--- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
@@ -91,12 +91,11 @@ typedef QPair<int, int> QQuickXmlListRange;
/*!
\qmltype XmlRole
- \instantiates QQuickXmlListModelRole
\inqmlmodule QtQuick.XmlListModel
\brief For specifying a role to an XmlListModel.
\ingroup qtquick-models
- \sa {Qt QML}
+ \sa {All QML Types}{Qt QML}
*/
/*!
@@ -133,7 +132,7 @@ typedef QPair<int, int> QQuickXmlListRange;
For example, if there is an XML document like this:
- \quotefile qml/xmlrole.xml
+ \quotefile qml/xmlrole.qml
Here are some valid XPath expressions for XmlRole queries on this document:
\snippet qml/xmlrole.qml 0
@@ -627,7 +626,6 @@ void QQuickXmlListModelPrivate::clear_role(QQmlListProperty<QQuickXmlListModelRo
/*!
\qmltype XmlListModel
- \instantiates QQuickXmlListModel
\inqmlmodule QtQuick.XmlListModel
\brief For specifying a read-only model using XPath expressions.
\ingroup qtquick-models
@@ -640,7 +638,7 @@ void QQuickXmlListModelPrivate::clear_role(QQmlListProperty<QQuickXmlListModelRo
XmlListModel is used to create a read-only model from XML data. It can be used as a data source
for view elements (such as ListView, PathView, GridView) and other elements that interact with model
- data (such as \l Repeater).
+ data (such as \l [QML]{Repeater}).
For example, if there is a XML document at http://www.mysite.com/feed.xml like this:
diff --git a/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc
index 3a399c12..1229b4a6 100644
--- a/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc
+++ b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc
@@ -33,6 +33,8 @@
The Qt XML Patterns module provides support for XPath,
XQuery, XSLT, and XML Schema validation.
+ \note This module is deprecated since Qt 5.13.
+
\section1 Getting Started
To include the definitions of the module's classes, use the