summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-08 01:00:13 (GMT)
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-08 01:00:13 (GMT)
commita8e65ad228eb36b0687df050974730e43575ccd1 (patch)
tree6d880546be4b0d3ee3853a294167a9de834ee81f
parentec37df9608ba674c3200e9f23030478018c50236 (diff)
parent9949065280674cf06a6a9670c1100d9ab8156df6 (diff)
downloadqtxmlpatterns-a8e65ad228eb36b0687df050974730e43575ccd1.tar.gz
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I33e9b923229e1f7893cfb1da1b8354e3e1487c47
-rw-r--r--src/imports/xmllistmodel/qqmlxmllistmodel.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index dbfdd5c..8941b33 100644
--- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
@@ -74,7 +74,7 @@ typedef QPair<int, int> QQuickXmlListRange;
#define XMLLISTMODEL_CLEAR_ID 0
/*!
- \qmlmodule QtQuick.XmlListModel 2.11
+ \qmlmodule QtQuick.XmlListModel 2.12
\title Qt Quick XmlListModel QML Types
\ingroup qmlmodules
\brief Provides QML types for creating models from XML data
@@ -84,7 +84,7 @@ typedef QPair<int, int> QQuickXmlListRange;
To use the types in this module, import the module with the following line:
\code
- import QtQuick.XmlListModel 2.11
+ import QtQuick.XmlListModel 2.12
\endcode
*/
@@ -92,7 +92,7 @@ typedef QPair<int, int> QQuickXmlListRange;
\qmltype XmlRole
\instantiates QQuickXmlListModelRole
\inqmlmodule QtQuick.XmlListModel
- \brief For specifying a role to an XmlListModel
+ \brief For specifying a role to an XmlListModel.
\ingroup qtquick-models
\sa {Qt QML}
@@ -628,7 +628,7 @@ void QQuickXmlListModelPrivate::clear_role(QQmlListProperty<QQuickXmlListModelRo
\qmltype XmlListModel
\instantiates QQuickXmlListModel
\inqmlmodule QtQuick.XmlListModel
- \brief For specifying a read-only model using XPath expressions
+ \brief For specifying a read-only model using XPath expressions.
\ingroup qtquick-models