diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 03:00:12 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-01-28 03:00:12 +0100 |
commit | ccde017309249a01e67cae0f2b89b3ae4285ca4d (patch) | |
tree | aebe3b95f7edd823e7dc38f54aae08e9c1bdf87d /src | |
parent | e263fec484d23fc2e652f538f39934b5364339e1 (diff) | |
parent | aea5ed0abbdc7d1654aab82ddd50e1d557f1e5a5 (diff) | |
download | qtxmlpatterns-ccde017309249a01e67cae0f2b89b3ae4285ca4d.tar.gz |
Merge remote-tracking branch 'origin/5.14' into 5.15
Change-Id: Ib8ba4718239d5b7690a20b50c6f49a055a0ea04f
Diffstat (limited to 'src')
-rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 2 | ||||
-rw-r--r-- | src/xmlpatterns/doc/snippets/qml/xmlrole.xml | 20 |
2 files changed, 21 insertions, 1 deletions
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index 494a007..a7ccf6c 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -132,7 +132,7 @@ typedef QPair<int, int> QQuickXmlListRange; For example, if there is an XML document like this: - \quotefile qml/xmlrole.qml + \quotefile qml/xmlrole.xml Here are some valid XPath expressions for XmlRole queries on this document: \snippet qml/xmlrole.qml 0 diff --git a/src/xmlpatterns/doc/snippets/qml/xmlrole.xml b/src/xmlpatterns/doc/snippets/qml/xmlrole.xml new file mode 100644 index 0000000..70280e0 --- /dev/null +++ b/src/xmlpatterns/doc/snippets/qml/xmlrole.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="iso-8859-1" ?> +<catalog> + <book type="Online" wanted="true"> + <title>Qt 5 Cadaques</title> + <year>2014</year> + <author>Juergen Bocklage-Ryannel</author> + <author>Johan Thelin</author> + </book> + <book type="Hardcover"> + <title>C++ GUI Programming with Qt 4</title> + <year>2006</year> + <author>Jasmin Blanchette</author> + <author>Mark Summerfield</author> + </book> + <book type="Paperback"> + <title>Programming with Qt</title> + <year>2002</year> + <author>Matthias Kalle Dalheimer</author> + </book> + </catalog> |