summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-19 03:03:45 +0100
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-03-19 03:03:45 +0100
commit6956f20f97280cf915199984de0bf5d7bb6161b8 (patch)
treed6155882c072515898216cbe4aba5ccf963431e9
parentbc4290cde83470dd72eb49e8cf6275f7b7a70f38 (diff)
parent6ef1a201e1608ec41d71425bdb32155e002cd934 (diff)
downloadqtxmlpatterns-6956f20f97280cf915199984de0bf5d7bb6161b8.tar.gz
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Ia8492d9fdb809f0a88ea35a6930d41ec6112e76e
-rw-r--r--dist/changes-5.12.220
-rw-r--r--src/imports/xmllistmodel/plugins.qmltypes4
2 files changed, 22 insertions, 2 deletions
diff --git a/dist/changes-5.12.2 b/dist/changes-5.12.2
new file mode 100644
index 0000000..0c8bd85
--- /dev/null
+++ b/dist/changes-5.12.2
@@ -0,0 +1,20 @@
+Qt 5.12.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.12.0 through 5.12.1.
+
+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.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+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.
+
+ - This release contains only minor code improvements.
diff --git a/src/imports/xmllistmodel/plugins.qmltypes b/src/imports/xmllistmodel/plugins.qmltypes
index 951d0b6..39b4429 100644
--- a/src/imports/xmllistmodel/plugins.qmltypes
+++ b/src/imports/xmllistmodel/plugins.qmltypes
@@ -4,10 +4,10 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.12'
+// 'qmlplugindump -nonrelocatable QtQuick.XmlListModel 2.13'
Module {
- dependencies: ["QtQuick 2.12"]
+ dependencies: ["QtQuick 2.0"]
Component {
name: "QQuickXmlListModel"
defaultProperty: "roles"