From 0fa22b3674db3d48bbd0b091b7710158ae152daa Mon Sep 17 00:00:00 2001
From: Antti Kokko <antti.kokko@qt.io>
Date: Thu, 9 Jan 2020 10:28:07 +0200
Subject: Add changes file for Qt 5.14.1

+ 089bdc0fcc1d87c6f5fe0835a4f723a6677e9a01 Catch invalid simple type that was causing a crash
+ 45ad1dc9c5f7330ea5d33cc8c8585d33b097e2e8 Enable auto tests run stand-alone
+ 7c8d1494dc06ff00508f512bdcf8153f21f348ff Add binary compatibility file for qtxmlpatterns 5.14 branch
+ b8c12ed8b1287462b897de76b7a9ad3ff5cc2194 Bump version

Change-Id: Ia2156a2bcac6bc520162ef7e5d5fac2bd9acd028
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
---
 dist/changes-5.14.1 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 dist/changes-5.14.1

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.
-- 
cgit v1.2.1


From 005a475a2d4dcc16c2a84a3d0f4b11ed44abe205 Mon Sep 17 00:00:00 2001
From: Paul Wicking <paul.wicking@qt.io>
Date: Mon, 27 Jan 2020 06:52:10 +0100
Subject: 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>
---
 src/imports/xmllistmodel/qqmlxmllistmodel.cpp |  2 +-
 src/xmlpatterns/doc/snippets/qml/xmlrole.xml  | 20 ++++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 src/xmlpatterns/doc/snippets/qml/xmlrole.xml

diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index 053e16a..ab15a3c 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>
-- 
cgit v1.2.1