diff options
| author | Martin Smith <martin.smith@qt.io> | 2019-09-14 14:54:24 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2019-09-16 13:15:55 +0200 |
| commit | 43a6970ce328109d9d367978fa09e838bbac8596 (patch) | |
| tree | d532322616c32da86c733b83cc2887f5ba45f135 | |
| parent | 28eb0caec23e0c315056cb035535b8806ccb0f37 (diff) | |
doc: Add missing directories to qdocconf files
These might not be complete yet, but they do fix the
qdoc errors.
Change-Id: I75b0f0f7709a371149a6f7c82adfff9fe88408ea
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| -rw-r--r-- | src/qml/doc/qtqml.qdocconf | 10 | ||||
| -rw-r--r-- | src/qmlmodels/qqmlitemmodels.qdoc | 2 | ||||
| -rw-r--r-- | src/qmlmodels/qqmltablemodel.cpp | 2 | ||||
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index cb9fb575b2..74d0a3b27c 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -37,11 +37,17 @@ tagfile = ../../../doc/qtqml/qtqml.tags depends += qtcore qtgui qtquick qtdoc qtlinguist qmake qtscript qtwidgets qtxmlpatterns qtquickcontrols headerdirs += .. \ - ../../imports/models + ../../imports/models \ + ../../qmlmodels \ + ../../qml \ + ../../qmlworkerscript sourcedirs += .. \ ../../imports/models \ - ../../imports/statemachine + ../../imports/statemachine \ + ../../qmlmodels \ + ../../qml \ + ../../qmlworkerscript exampledirs += ../../../examples/qml \ ../ \ diff --git a/src/qmlmodels/qqmlitemmodels.qdoc b/src/qmlmodels/qqmlitemmodels.qdoc index f6e1b0b1b9..2e12dbf656 100644 --- a/src/qmlmodels/qqmlitemmodels.qdoc +++ b/src/qmlmodels/qqmlitemmodels.qdoc @@ -62,7 +62,7 @@ \section1 QModelIndexList Type - \l QModelIndexList is exposed in QML as a JavaScript array. Conversions are + QModelIndexList is exposed in QML as a JavaScript array. Conversions are automatically made from and to C++. In fact, any JavaScript array can be converted back to QModelIndexList, with non-QModelIndex objects replaced by invalid \l{QModelIndex}es. diff --git a/src/qmlmodels/qqmltablemodel.cpp b/src/qmlmodels/qqmltablemodel.cpp index 4a96e7a46b..f190ad86b1 100644 --- a/src/qmlmodels/qqmltablemodel.cpp +++ b/src/qmlmodels/qqmltablemodel.cpp @@ -64,7 +64,7 @@ Q_LOGGING_CATEGORY(lcTableModel, "qt.qml.tablemodel") The model's initial row data is set with either the \l rows property or by calling \l appendRow(). Each column in the model is specified by declaring a \l TableModelColumn instance, where the order of each instance determines - its column index. Once the model's \l Component.completed() signal has been + its column index. Once the model's \l Component::completed() signal has been emitted, the columns and roles will have been established and are then fixed for the lifetime of the model. diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 13746b13de..6a4300c1bd 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -41,9 +41,11 @@ tagfile = ../../../doc/qtquick/qtquick.tags depends += qtcore qtqml qtqmltest qtgui qtlinguist qtquickcontrols1 qtquickcontrols qtdoc qtquickdialogs qtsensors qtwidgets qmake qtmultimedia qtgraphicaleffects qtsql qtxmlpatterns headerdirs += ..\ + ../../quick \ ../../quickwidgets sourcedirs += .. \ + ../../quick \ ../../quickwidgets exampledirs += ../../../examples/quick \ |