diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-04-30 13:03:57 +0200 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-04-30 11:14:05 +0000 |
| commit | 6b42ecdcc3878d4f31a207e76e5c27136a45fa34 (patch) | |
| tree | 2ff98dc898c1ea63dcd4f5c118efec853cc5671e | |
| parent | aadfb8afc9d7f9ae00bdb53b72e39ff0b2bebe6d (diff) | |
Doc: Use additional include paths for some Qt modules
Some of the Qt documentation modules use custom module headers
that pull in additional content into the build. On a normal
Qt documentation build, these are implemented as relative paths
- these are incorrect when the doc build is invoked externally
in PySide.
To fix this, add absolute qdocconf include path entries for each
module that needs them. This cuts down the number of QDoc warnings
significantly.
Change-Id: I22756cc3170e7e2ff678986a46e117faf43a735d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
4 files changed, 4 insertions, 0 deletions
diff --git a/sources/pyside2/doc/qtmodules/pyside-qt3dextras.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qt3dextras.qdocconf.in index 5bc4e8c9c..20bd8d730 100644 --- a/sources/pyside2/doc/qtmodules/pyside-qt3dextras.qdocconf.in +++ b/sources/pyside2/doc/qtmodules/pyside-qt3dextras.qdocconf.in @@ -1,2 +1,3 @@ include(@QT_SRC_DIR@/../qt3d/src/doc/qt3d.qdocconf) +includepaths += -I @QT_SRC_DIR@/../qt3d/src/doc include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtmultimedia.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtmultimedia.qdocconf.in index 35bf1bc6a..5415c392c 100644 --- a/sources/pyside2/doc/qtmodules/pyside-qtmultimedia.qdocconf.in +++ b/sources/pyside2/doc/qtmodules/pyside-qtmultimedia.qdocconf.in @@ -1,2 +1,3 @@ include(@QT_SRC_DIR@/../qtmultimedia/src/multimedia/doc/qtmultimedia.qdocconf) +includepaths += -I @QT_SRC_DIR@/../qtmultimedia/src/multimedia/doc include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qtquickwidgets.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qtquickwidgets.qdocconf.in index 242dc3c02..6f59645f3 100644 --- a/sources/pyside2/doc/qtmodules/pyside-qtquickwidgets.qdocconf.in +++ b/sources/pyside2/doc/qtmodules/pyside-qtquickwidgets.qdocconf.in @@ -1,2 +1,3 @@ include(@QT_SRC_DIR@/../qtdeclarative/src/quick/doc/qtquick.qdocconf) +includepaths += -I @QT_SRC_DIR@/../qtdeclarative/src/quick/doc include(../pyside-config.qdocconf) diff --git a/sources/pyside2/doc/qtmodules/pyside-qttexttospeech.qdocconf.in b/sources/pyside2/doc/qtmodules/pyside-qttexttospeech.qdocconf.in index 2bf722f23..ed49121c1 100644 --- a/sources/pyside2/doc/qtmodules/pyside-qttexttospeech.qdocconf.in +++ b/sources/pyside2/doc/qtmodules/pyside-qttexttospeech.qdocconf.in @@ -1,2 +1,3 @@ include(@QT_SRC_DIR@/../qtspeech/src/doc/qtspeech.qdocconf) +includepaths += -I @QT_SRC_DIR@/../qtspeech/src/doc include(../pyside-config.qdocconf) |