diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-08 03:02:01 +0100 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-08 03:02:01 +0100 |
commit | 035fcbc69c790a3cb46ba9ed75654741aebc7c77 (patch) | |
tree | 327896a8cd515381ff524377d86deff5089f44e0 /src | |
parent | 2525c7e2ed63f3a33b8a40d84d379787ed4d455f (diff) | |
parent | 5b5da71586c8391fd74415ec9241c13489445b2a (diff) | |
download | qtxmlpatterns-035fcbc69c790a3cb46ba9ed75654741aebc7c77.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: If5721286fbb7c3dd0564f11e12311176477b92bb
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> |