summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Wicking <paul.wicking@qt.io>2020-01-27 06:52:10 +0100
committerPaul Wicking <paul.wicking@qt.io>2020-01-27 11:27:55 +0100
commit005a475a2d4dcc16c2a84a3d0f4b11ed44abe205 (patch)
treeaa92e52d722c5671a7aa331f0c32d57d3b2b2260
parentb8c12ed8b1287462b897de76b7a9ad3ff5cc2194 (diff)
Doc: Fix regression caused by moving files around (leave no file behind)
When xmllistmodel moved to xmlpatterns, an xml file quoted from in docs was unintentionally left behind. This adds the missing file, and corrects the file to quote from (which had since been adjusted to quote from the wrong file). Fixes: QTBUG-77176 Change-Id: I9cc871cf58dd33ce922fa0f6c5d86800210208c5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
-rw-r--r--src/imports/xmllistmodel/qqmlxmllistmodel.cpp2
-rw-r--r--src/xmlpatterns/doc/snippets/qml/xmlrole.xml20
2 files changed, 21 insertions, 1 deletions
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index 053e16a8..ab15a3c2 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 00000000..70280e06
--- /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>