diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-06-25 09:53:01 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-06-25 12:15:55 +0200 |
| commit | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (patch) | |
| tree | 18e22092c2764fea16442fd814f230d4fe095a49 /src/imports/xmllistmodel | |
| parent | c21a6a9f2c2d635aca3bf88a6431c560b16b1cc6 (diff) | |
| parent | 9999591e69a0908cd3fbe14646fb98881e32061b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/qmltooling/packetprotocol/qpacketprotocol.cpp
src/quick/handlers/qquickhandlerpoint.cpp
src/quick/handlers/qquicksinglepointhandler.cpp
tests/auto/qml/ecmascripttests/test262
Change-Id: I8908ec8c6116ca626fbd269af7625d4c429429ca
Diffstat (limited to 'src/imports/xmllistmodel')
| -rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index dbfdd5cfb4..df0881092b 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -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 |