diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2021-02-01 14:57:20 +0100 |
|---|---|---|
| committer | Topi Reinio <topi.reinio@qt.io> | 2021-02-01 18:50:09 +0100 |
| commit | 2338818565bf84eb56949cadac7d8f4181cc4ac0 (patch) | |
| tree | 2b9e68841507187ee6b1f99ebc7cfef77e1ac50c | |
| parent | edca9f3d60141a823a3b4401039f260c2c7f7888 (diff) | |
Doc: Fix documentation warnings for Qt Quick
- Source code for several QML modules has moved, adjust documentation
configuration accordingly.
- Comment out \instantiates commands referring to internal/undocumented
classes.
Task-number: QTBUG-90439
Change-Id: I360c8a5c02c5a03b84c77010f399d1a0e36b1263
Reviewed-by: Nico Vertriest <nico.vertriest@qt.io>
| -rw-r--r-- | src/qmlmodels/doc/qtqmlmodels.qdocconf | 11 | ||||
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 17 | ||||
| -rw-r--r-- | src/quicklayouts/qquicklinearlayout.cpp | 6 | ||||
| -rw-r--r-- | src/quicklayouts/qquickstacklayout.cpp | 2 |
4 files changed, 16 insertions, 20 deletions
diff --git a/src/qmlmodels/doc/qtqmlmodels.qdocconf b/src/qmlmodels/doc/qtqmlmodels.qdocconf index 4b7fe654ac..4a42d4a2d1 100644 --- a/src/qmlmodels/doc/qtqmlmodels.qdocconf +++ b/src/qmlmodels/doc/qtqmlmodels.qdocconf @@ -25,12 +25,11 @@ tagfile = qtqmlmodels.tags depends += qtcore qtqml qtquick qtdoc qtqmlworkerscript qtquickcontrols -headerdirs += .. \ - ../../imports/labsmodels - -sourcedirs += .. \ - ../../imports/models \ - ../../imports/labsmodels +{headerdirs,sourcedirs} += \ + .. \ + ../../labs/models \ + ../../imports/models \ + ../../imports/labsmodels exampledirs += .. \ snippets diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index c02af49d3c..12d56a665c 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -56,20 +56,17 @@ depends += \ qmake \ qtcmake -headerdirs += ..\ - ../../quick \ - ../../quickwidgets \ - ../../qmllocalstorage - -sourcedirs += .. \ - ../../quick \ - ../../quickwidgets \ - ../../qmllocalstorage +{headerdirs,sourcedirs} += \ + ..\ + ../../quick \ + ../../quickwidgets \ + ../../qmllocalstorage \ + ../../quicklayouts \ + ../../labs/animation exampledirs += ../../../examples/quick \ snippets - imagedirs += images #add particles and shapes sources diff --git a/src/quicklayouts/qquicklinearlayout.cpp b/src/quicklayouts/qquicklinearlayout.cpp index 760700beaf..2f97708b52 100644 --- a/src/quicklayouts/qquicklinearlayout.cpp +++ b/src/quicklayouts/qquicklinearlayout.cpp @@ -47,7 +47,7 @@ /*! \qmltype RowLayout - \instantiates QQuickRowLayout + //! \instantiates QQuickRowLayout \inherits Item \inqmlmodule QtQuick.Layouts \ingroup layouts @@ -101,7 +101,7 @@ /*! \qmltype ColumnLayout - \instantiates QQuickColumnLayout + //! \instantiates QQuickColumnLayout \inherits Item \inqmlmodule QtQuick.Layouts \ingroup layouts @@ -154,7 +154,7 @@ /*! \qmltype GridLayout - \instantiates QQuickGridLayout + //! \instantiates QQuickGridLayout \inherits Item \inqmlmodule QtQuick.Layouts \ingroup layouts diff --git a/src/quicklayouts/qquickstacklayout.cpp b/src/quicklayouts/qquickstacklayout.cpp index 3a7e28789d..19d0033e8b 100644 --- a/src/quicklayouts/qquickstacklayout.cpp +++ b/src/quicklayouts/qquickstacklayout.cpp @@ -45,7 +45,7 @@ /*! \qmltype StackLayout - \instantiates QQuickStackLayout + //! \instantiates QQuickStackLayout \inherits Item \inqmlmodule QtQuick.Layouts \ingroup layouts |