diff options
author | Topi Reinio <topi.reinio@digia.com> | 2015-06-12 15:43:39 +0200 |
---|---|---|
committer | Topi Reiniƶ <topi.reinio@digia.com> | 2015-06-15 11:28:58 +0000 |
commit | 60cb61f9d70ec52f3193bac44384099d921827b3 (patch) | |
tree | d24608c2e7c438f603c8e566e1b5a45f29d6afcd /src/core/doc/src/qt3dcore-index.qdoc | |
parent | 6f93508bcd38d8d0fa524ac00d65b518fac0d82a (diff) |
Doc: Fix multiple documentation issuesv5.5.0-rc1
- Restore qt3d-index.html as the main landing page. Needed
for external linking.
- Fix \inmodule commands for Renderer classes
- Add proper group so that all three modules are listed on
the landing page, both C++ and QML modules
- Remove qt3drenderer-index.html (to be consistent with
Qt3DCore), copy contents over to the module page and
to a new file, qt3d-examples.qdoc.
- Fix indexTitles in qdocconf files, and subprojects for
Renderer QML types and Qt3D examples
Change-Id: I0e2497771d0525d120ffa9d7d6338b01fdfa6963
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'src/core/doc/src/qt3dcore-index.qdoc')
-rw-r--r-- | src/core/doc/src/qt3dcore-index.qdoc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/core/doc/src/qt3dcore-index.qdoc b/src/core/doc/src/qt3dcore-index.qdoc index ec8c6c1b7..5c3bc9794 100644 --- a/src/core/doc/src/qt3dcore-index.qdoc +++ b/src/core/doc/src/qt3dcore-index.qdoc @@ -36,18 +36,22 @@ ****************************************************************************/ /*! - \page qt3dcore-index.html + \page qt3d-index.html \title Qt3D Module \e Qt3D provides functionality for near-realtime simulation systems with support for 2D and 3D rendering in both Qt C++ and Qt Quick applications. - The functionality in Qt3D is divided into the following modules: + The functionality in Qt3D is divided into the following C++ modules: \annotatedlist qt3d-modules - Classes, types and functions are declared under the \l Qt3D namespace. + Classes, types and functions are declared under the \l [CPP] {Qt3D} namespace. + + For Qt Quick applications, Qt3D provides the following QML modules: + + \annotatedlist qt3d-qmlmodules \section1 Getting Started @@ -80,9 +84,8 @@ \section1 Reference \list - \li \l {Qt3D}{Qt3D namespace} - \li \l {Qt3D Core C++ Classes} - \li \l {Qt3D Render C++ Classes} + \li \l {Qt3D Overview} + \li \l [CPP] {Qt3D}{Qt3D Namespace} \li \l {Qt3D Examples} \endlist |