diff options
| author | Topi Reinio <topi.reinio@qt.io> | 2018-11-07 10:41:11 +0100 |
|---|---|---|
| committer | Topi Reiniö <topi.reinio@qt.io> | 2018-11-07 18:32:24 +0000 |
| commit | 0d9aee0c22fb6bc4ff57c03f54b67d2817e1e886 (patch) | |
| tree | 1cc08cb7c67ec34a983a239132bc2b31346df9ed /src/doc | |
| parent | d682d612ec2ae75f12cde2525a0cacee798b2b49 (diff) | |
Documentation: Get rid of QT_INSTALL_HEADERS in documentation config
The use of QT_INSTALL_HEADERS caused documentation build failures
in certain configurations. Use an alternative method to pass the
required include paths to QDoc; make the documentation subproject
depend on (a subset of) Qt 3D modules to retrieve them.
Task-number: QTBUG-67925
Change-Id: I2fb745fb59c319b85c51b544acdab95cded2207e
Reviewed-by: Martin Smith <martin.smith@qt.io>
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/doc.pro | 10 | ||||
| -rw-r--r-- | src/doc/qt3d.qdocconf | 9 |
2 files changed, 11 insertions, 8 deletions
diff --git a/src/doc/doc.pro b/src/doc/doc.pro index 34ef2f2b4..ab6d8e9a6 100644 --- a/src/doc/doc.pro +++ b/src/doc/doc.pro @@ -1,5 +1,15 @@ TEMPLATE = aux +CONFIG += force_qt + +# Add Qt 3D modules for which QDoc needs include paths passed +QT += \ + core-private \ + 3dcore-private \ + 3drender-private \ + 3dinput-private \ + 3danimation-private + QMAKE_DOCS = $$PWD/qt3d.qdocconf OTHER_FILES += $$PWD/src/*.qdoc diff --git a/src/doc/qt3d.qdocconf b/src/doc/qt3d.qdocconf index 5ea4cd6f8..798dcbfd7 100644 --- a/src/doc/qt3d.qdocconf +++ b/src/doc/qt3d.qdocconf @@ -5,14 +5,7 @@ description = Qt 3D Reference Documentation version = $QT_VERSION moduleheader = Qt3DDoc -includepaths = -I . \ - -I $QT_INSTALL_HEADERS \ - -I $QT_INSTALL_HEADERS/Qt3DCore \ - -I $QT_INSTALL_HEADERS/Qt3DCore/$QT_VERSION \ - -I $QT_INSTALL_HEADERS/Qt3DAnimation \ - -I $QT_INSTALL_HEADERS/Qt3DAnimation/$QT_VERSION \ - -I $QT_INSTALL_HEADERS/Qt3DInput \ - -I $QT_INSTALL_HEADERS/Qt3DInput/$QT_VERSION +includepaths = -I . examplesinstallpath = qt3d |