diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:05:12 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-12-04 03:05:12 +0100 |
| commit | a63936973ccf936c22877facf5bcaf9e085fb81e (patch) | |
| tree | 41f4d394fabafe907d2343fa9cb58af0d68ffd9d | |
| parent | 15052d95e335b67bbdf87777fb530b1bf1a17263 (diff) | |
| parent | 19b28e271ca3f4d0042b739e90b3d902f2866044 (diff) | |
| download | qtxmlpatterns-a63936973ccf936c22877facf5bcaf9e085fb81e.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: Ibb7f43306ff82ed128a2045ab385c7d26446d647
| -rw-r--r-- | src/imports/xmllistmodel/qqmlxmllistmodel.cpp | 3 | ||||
| -rw-r--r-- | src/xmlpatterns/doc/qtxmlpatterns.qdocconf | 9 | ||||
| -rw-r--r-- | src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc | 1 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp index 470b419..ba8d948 100644 --- a/src/imports/xmllistmodel/qqmlxmllistmodel.cpp +++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp @@ -75,7 +75,8 @@ typedef QPair<int, int> QQuickXmlListRange; /*! \qmlmodule QtQuick.XmlListModel 2.\QtMinorVersion - \title Qt Quick XmlListModel QML Types + \title Qt XML Patterns QML Types + \keyword Qt Quick XmlListModel QML Types \ingroup qmlmodules \brief Provides QML types for creating models from XML data diff --git a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf index d7919dc..fd6ca90 100644 --- a/src/xmlpatterns/doc/qtxmlpatterns.qdocconf +++ b/src/xmlpatterns/doc/qtxmlpatterns.qdocconf @@ -12,7 +12,8 @@ exampledirs += ../../../examples/xmlpatterns \ headerdirs += .. imagedirs += images -sourcedirs += .. +sourcedirs += .. \ + ../../imports/xmllistmodel depends += qtcore qtxml qtwidgets qtdesigner qtdoc qmake qtwebkitexamples @@ -23,11 +24,15 @@ qhp.QtXmlPatterns.namespace = org.qt-project.qtxmlpatterns.$QT_VERSION_TAG qhp.QtXmlPatterns.indexTitle = Qt XML Patterns qhp.QtXmlPatterns.virtualFolder = qtxmlpatterns -qhp.QtXmlPatterns.subprojects = classes +qhp.QtXmlPatterns.subprojects = classes qmltypes qhp.QtXmlPatterns.subprojects.classes.title = C++ Classes qhp.QtXmlPatterns.subprojects.classes.indexTitle = Qt XML Patterns C++ Classes qhp.QtXmlPatterns.subprojects.classes.selectors = class fake:headerfile qhp.QtXmlPatterns.subprojects.classes.sortPages = true +qhp.QtXmlPatterns.subprojects.qmltypes.title = QML Types +qhp.QtXmlPatterns.subprojects.qmltypes.indexTitle = Qt XML Patterns QML Types +qhp.QtXmlPatterns.subprojects.qmltypes.selectors = qmltype +qhp.QtXmlPatterns.subprojects.qmltypes.sortPages = true tagfile = ../../../doc/qtxmlpatterns/qtxmlpatterns.tags diff --git a/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc index 0882017..3a399c1 100644 --- a/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc +++ b/src/xmlpatterns/doc/src/qtxmlpatterns-index.qdoc @@ -63,6 +63,7 @@ These are links to the API reference materials. \list \li \l{Qt XML Patterns C++ Classes}{C++ Classes} + \li \l{Qt XML Patterns QML Types}{QML Types} \endlist \section1 Licenses and Attributions |