aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2020-11-19 22:56:05 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-11-26 06:11:22 +0000
commit0054c3eb5eb379dd5ed2f42db866a8370d36bc54 (patch)
treed52fdbfa93d57f7f4cbb0886c06589eb46edbc24
parent7cb9ed1737ada6c914e8c6c1f401a412215582f8 (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>
-rw-r--r--src/qml/doc/qtqml.qdocconf13
-rw-r--r--src/quick/doc/qtquick.qdocconf15
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 \