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/qmlmodels | |
| 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/qmlmodels')
| -rw-r--r-- | src/qmlmodels/doc/images/listmodel-nested.png | bin | 0 -> 7493 bytes | |||
| -rw-r--r-- | src/qmlmodels/doc/images/listmodel.png | bin | 0 -> 3407 bytes | |||
| -rw-r--r-- | src/qmlmodels/doc/images/objectmodel.png | bin | 0 -> 347 bytes | |||
| -rw-r--r-- | src/qmlmodels/doc/qtqmlmodels.qdocconf | 13 | ||||
| -rw-r--r-- | src/qmlmodels/qqmllistmodel.cpp | 4 |
5 files changed, 10 insertions, 7 deletions
diff --git a/src/qmlmodels/doc/images/listmodel-nested.png b/src/qmlmodels/doc/images/listmodel-nested.png Binary files differnew file mode 100644 index 0000000000..ee7ffba67a --- /dev/null +++ b/src/qmlmodels/doc/images/listmodel-nested.png diff --git a/src/qmlmodels/doc/images/listmodel.png b/src/qmlmodels/doc/images/listmodel.png Binary files differnew file mode 100644 index 0000000000..7ab1771f15 --- /dev/null +++ b/src/qmlmodels/doc/images/listmodel.png diff --git a/src/qmlmodels/doc/images/objectmodel.png b/src/qmlmodels/doc/images/objectmodel.png Binary files differnew file mode 100644 index 0000000000..5e6d1325b2 --- /dev/null +++ b/src/qmlmodels/doc/images/objectmodel.png diff --git a/src/qmlmodels/doc/qtqmlmodels.qdocconf b/src/qmlmodels/doc/qtqmlmodels.qdocconf index a4153f4a53..3364988559 100644 --- a/src/qmlmodels/doc/qtqmlmodels.qdocconf +++ b/src/qmlmodels/doc/qtqmlmodels.qdocconf @@ -23,15 +23,18 @@ qhp.QtQmlModels.sortPages = true tagfile = qtqmlmodels.tags -depends += qtcore qtqml qtdoc +depends += qtcore qtqml qtquick qtdoc qtqmlworkerscript qtquickcontrols qtxmlpatterns -headerdirs += .. +headerdirs += .. \ + ../../imports/labsmodels sourcedirs += .. \ - ../../imports/models + ../../imports/models \ + ../../imports/labsmodels -exampledirs += ../../../examples/qml \ - ../ \ +exampledirs += .. \ snippets +imagedirs += images + navigation.qmltypespage = "Qt Qml Models QML Types" diff --git a/src/qmlmodels/qqmllistmodel.cpp b/src/qmlmodels/qqmllistmodel.cpp index e0a66e7170..f79910204a 100644 --- a/src/qmlmodels/qqmllistmodel.cpp +++ b/src/qmlmodels/qqmllistmodel.cpp @@ -1905,11 +1905,11 @@ void DynamicRoleModelNodeMetaObject::propertyWritten(int index) Here is an example that uses WorkerScript to periodically append the current time to a list model: - \snippet ../quick/threading/threadedlistmodel/timedisplay.qml 0 + \snippet ../../examples/quick/threading/threadedlistmodel/timedisplay.qml 0 The included file, \tt dataloader.mjs, looks like this: - \snippet ../quick/threading/threadedlistmodel/dataloader.mjs 0 + \snippet ../../examples/quick/threading/threadedlistmodel/dataloader.mjs 0 The timer in the main example sends messages to the worker script by calling \l WorkerScript::sendMessage(). When this message is received, |
