diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2019-11-08 00:48:05 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2019-11-11 09:53:52 +0000 |
| commit | 13d7517c0edd4c99686f2a8f7611c51d0a56a279 (patch) | |
| tree | 2a98462cfdc5031404f803cfe6941be77db9ff06 /src/imports | |
| parent | 06fa6ef1b9e159bd9b83b59ce23b7e09b918aa1f (diff) | |
Doc: Fix documentation warnings
There were a lot of documentation warnings introduced by the
separation of QtQml.Models and QtQml.WorkerScript modules
from the QtQml documentation project into their own
sub-projects.
Fix the above, and also ensure that the experimental
Qt.labs.qmlmodels QML types are listed in the documentation,
and add them also on the QML module page for QtQml.Models.
A few warnings remain, they may be indicative of issues
not in the scope of this commit.
Fixes: QTBUG-79812
Change-Id: Idc25c976e4c96feab4aae893519d6c9245f57a64
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/labsmodels/plugin.cpp | 2 | ||||
| -rw-r--r-- | src/imports/models/plugin.cpp | 17 |
2 files changed, 17 insertions, 2 deletions
diff --git a/src/imports/labsmodels/plugin.cpp b/src/imports/labsmodels/plugin.cpp index cebc1dc920..697235e1ca 100644 --- a/src/imports/labsmodels/plugin.cpp +++ b/src/imports/labsmodels/plugin.cpp @@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE \qmlmodule Qt.labs.qmlmodels 1.0 \title Qt QML Models experimental QML Types \ingroup qmlmodules - \brief Provides QML experimental types for data models + \brief Provides QML experimental types for data models. \since 5.12 This QML module contains experimental QML types related to data models. diff --git a/src/imports/models/plugin.cpp b/src/imports/models/plugin.cpp index 9fe63412f3..319321013e 100644 --- a/src/imports/models/plugin.cpp +++ b/src/imports/models/plugin.cpp @@ -59,8 +59,23 @@ QT_BEGIN_NAMESPACE import QtQml.Models 2.\1 \endqml - Note that QtQml.Models module started at version 2.1 to match the version + \note QtQml.Models module started at version 2.1 to match the version of the parent module, \l{Qt QML}. + + In addition, Qt.labs.qmlmodels provides experimental QML types for models. + To use these experimental types, import the module with the following line: + + \qml + import Qt.labs.qmlmodels 1.0 + \endqml + + \section1 QML Types + \generatelist qmltypesbymodule QtQml.Models + + \section1 Experimental QML Types + \generatelist qmltypesbymodule Qt.labs.qmlmodels + + \noautolist */ |