diff options
| author | Tomi Korpipää <tomi.korpipaa@theqtcompany.com> | 2016-01-19 09:30:18 +0200 |
|---|---|---|
| committer | Pasi Keränen <pasi.keranen@theqtcompany.com> | 2016-01-19 10:51:18 +0000 |
| commit | 4aeadb92130ce650bf5f137071d7777783eaa0e8 (patch) | |
| tree | 55838592f049a5dfd778f09b2a0cc4c5c950d3d2 /src/doc | |
| parent | e2b88264cc623202362bf6221aaa6717c0a57494 (diff) | |
Fixed some documentation warnings
Change-Id: I5055043641a1916dde47ad614d8ab7a5788fd93b
Task-number: QTBUG-46037
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@theqtcompany.com>
Reviewed-by: Pasi Keränen <pasi.keranen@theqtcompany.com>
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/qt3d.qdocconf | 6 | ||||
| -rw-r--r-- | src/doc/src/qt3d-index.qdoc | 4 | ||||
| -rw-r--r-- | src/doc/src/qt3d-overview.qdoc | 4 | ||||
| -rw-r--r-- | src/doc/src/qt3drender-module.qdoc | 2 |
4 files changed, 11 insertions, 5 deletions
diff --git a/src/doc/qt3d.qdocconf b/src/doc/qt3d.qdocconf index 72f4060a7..d36c1d280 100644 --- a/src/doc/qt3d.qdocconf +++ b/src/doc/qt3d.qdocconf @@ -6,6 +6,12 @@ version = $QT_VERSION examplesinstallpath = qt3d/qt3d +indexes += $QT_INSTALL_DOCS/qtcore/qtcore.index \ + $QT_INSTALL_DOCS/qtgui/qtgui.index \ + $QT_INSTALL_DOCS/qtqml/qtqml.index \ + $QT_INSTALL_DOCS/qtquick/qtquick.index \ + $QT_INSTALL_DOCS/qmake/qmake.index + qhp.projects = Qt3D qhp.Qt3D.file = qt3d.qhp diff --git a/src/doc/src/qt3d-index.qdoc b/src/doc/src/qt3d-index.qdoc index 99a549b9b..4c2ce5a11 100644 --- a/src/doc/src/qt3d-index.qdoc +++ b/src/doc/src/qt3d-index.qdoc @@ -81,8 +81,8 @@ \section1 Overview The high level design and motivation for Qt3D is described in the \l {Qt 3D - Overview}. The Qt 3D Renderer aspect offers support for data-driven - configuration as described in \l {Qt 3D Renderer Framegraph}. + Overview}. The Qt 3D Render aspect offers support for data-driven + configuration as described in \l {Qt 3D Render Framegraph}. \section1 Reference \list diff --git a/src/doc/src/qt3d-overview.qdoc b/src/doc/src/qt3d-overview.qdoc index c77265ed9..331f508e6 100644 --- a/src/doc/src/qt3d-overview.qdoc +++ b/src/doc/src/qt3d-overview.qdoc @@ -157,7 +157,7 @@ and the fragment's depth can be compared with the result of the sampling. If the fragment is further away, then it is in shadow; otherwise it is lit. - For example code, see the \l {Qt3D: Shadow Map QML Example}. + For example code, see the \l {Qt 3D: Shadow Map QML Example}. \section2 Instanced Rendering @@ -183,7 +183,7 @@ To combine support for both C++ and QML APIs with having a fully configurable renderer, the concept of a \e framegraph was introduced. While a \e scenegraph is a data-driven description of \e what to render, a \l - {Qt 3D Renderer Framegraph}{framegraph} is a data-driven description of \e + {Qt 3D Render Framegraph}{framegraph} is a data-driven description of \e how to render it. A framegraph enables developers to choose between a simple forward renderer, diff --git a/src/doc/src/qt3drender-module.qdoc b/src/doc/src/qt3drender-module.qdoc index bae6217fd..7bab5cdf8 100644 --- a/src/doc/src/qt3drender-module.qdoc +++ b/src/doc/src/qt3drender-module.qdoc @@ -63,7 +63,7 @@ \section1 Overview The Qt 3D Render aspect offers support for data-driven configuration as described - in \l {Qt3D Render Framegraph}. + in \l {Qt 3D Render Framegraph}. \section1 Reference \list |