diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2020-11-19 22:56:05 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-26 00:43:41 +0000 |
| commit | 13b4328c2f41a41392aba60b09b2dbeffdf092e0 (patch) | |
| tree | bd3491903c8f10aff4432dd29e747130c87759f5 /src | |
| parent | ee22a00d3e9d7bcd5075136fdf7c38bb5aee521b (diff) | |
Doc: Fix documentation dependencies
- Add missing dependency to qtquick3d
- Remove qtscript, qtquickdialog dependencies
- Use multiline formatting to have a clean git history of dependencies
Change-Id: If79df67ef14cce4156cd24042725e56654da4444
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
(cherry picked from commit 22852a84a7146e2b36c59731845cba1d0eb3c409)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/qml/doc/qtqml.qdocconf | 13 | ||||
| -rw-r--r-- | src/quick/doc/qtquick.qdocconf | 15 |
2 files changed, 26 insertions, 2 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf index 23999cf597..7f530be109 100644 --- a/src/qml/doc/qtqml.qdocconf +++ b/src/qml/doc/qtqml.qdocconf @@ -34,7 +34,18 @@ qhp.QtQml.subprojects.qmltypes.sortPages = true tagfile = ../../../doc/qtqml/qtqml.tags -depends += qtcore qtqmlmodels qtqmlworkerscript qtgui qtquick qtdoc qtlinguist qtscript qtwidgets qtquickcontrols qmake qtcmake +depends += \ + qtcore \ + qtqmlmodels \ + qtqmlworkerscript \ + qtgui \ + qtquick \ + qtdoc \ + qtlinguist \ + qtwidgets \ + qtquickcontrols \ + qmake \ + qtcmake headerdirs += .. \ ../../qml diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf index 49a0a3e9aa..93804c6693 100644 --- a/src/quick/doc/qtquick.qdocconf +++ b/src/quick/doc/qtquick.qdocconf @@ -38,7 +38,20 @@ qhp.QtQuick.subprojects.examples.selectors = fake:example tagfile = ../../../doc/qtquick/qtquick.tags -depends += qtcore qtqml qtqmlmodels qtqmltest qtgui qtlinguist qtquickcontrols qtdoc qtplatformintegration qtquickdialogs qtwidgets qmake qtsql +depends += \ + qtcore \ + qtqml \ + qtqmlmodels \ + qtqmltest \ + qtgui \ + qtlinguist \ + qtquickcontrols \ + qtquick3d \ + qtdoc \ + qtplatformintegration \ + qtwidgets \ + qmake \ + qtsql headerdirs += ..\ ../../quick \ |