diff options
-rw-r--r-- | dist/changes-5.14.1 | 20 | ||||
-rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 2 | ||||
-rw-r--r-- | src/xmlpatterns/doc/snippets/qml/xmlrole.xml | 20 |
3 files changed, 41 insertions, 1 deletions
diff --git a/dist/changes-5.14.1 b/dist/changes-5.14.1 new file mode 100644 index 0000000..fda23e5 --- /dev/null +++ b/dist/changes-5.14.1 @@ -0,0 +1,20 @@ +Qt 5.14.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.14.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +https://doc.qt.io/qt-5/index.html + +The Qt version 5.14 series is binary compatible with the 5.13.x series. +Applications compiled for 5.13 will continue to run with 5.14. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + + - [QTBUG-77620] Fixed a crash in XML validation. 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> |