From 60cb61f9d70ec52f3193bac44384099d921827b3 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Fri, 12 Jun 2015 15:43:39 +0200 Subject: Doc: Fix multiple documentation issues - 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 --- src/render/doc/qt3drenderer.qdocconf | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'src/render/doc/qt3drenderer.qdocconf') diff --git a/src/render/doc/qt3drenderer.qdocconf b/src/render/doc/qt3drenderer.qdocconf index 4214188db..e56b6f992 100644 --- a/src/render/doc/qt3drenderer.qdocconf +++ b/src/render/doc/qt3drenderer.qdocconf @@ -11,19 +11,29 @@ qhp.projects = Qt3DRenderer qhp.Qt3DRenderer.file = qt3drenderer.qhp qhp.Qt3DRenderer.namespace = org.qt-project.qt3drenderer.$QT_VERSION_TAG qhp.Qt3DRenderer.virtualFolder = qt3drenderer -qhp.Qt3DRenderer.indexTitle = Qt3D Renderer +qhp.Qt3DRenderer.indexTitle = Qt3D Renderer C++ Classes qhp.Qt3DRenderer.indexRoot = qhp.Qt3DRenderer.filterAttributes = qt3drenderer $QT_VERSION qtrefdoc qhp.Qt3DRenderer.customFilters.Qt.name = Qt3DRenderer $QT_VERSION qhp.Qt3DRenderer.customFilters.Qt.filterAttributes = qt3drenderer $QT_VERSION -qhp.Qt3DRenderer.subprojects = classes +qhp.Qt3DRenderer.subprojects = classes qmltypes examples qhp.Qt3DRenderer.subprojects.classes.title = C++ Classes qhp.Qt3DRenderer.subprojects.classes.indexTitle = Qt3D Renderer C++ Classes qhp.Qt3DRenderer.subprojects.classes.selectors = class fake:headerfile qhp.Qt3DRenderer.subprojects.classes.sortPages = true +qhp.Qt3DRenderer.subprojects.qmltypes.title = QML Types +qhp.Qt3DRenderer.subprojects.qmltypes.indexTitle = Qt3D Renderer QML Types +qhp.Qt3DRenderer.subprojects.qmltypes.selectors = qmlclass +qhp.Qt3DRenderer.subprojects.qmltypes.sortPages = true + +qhp.Qt3DRenderer.subprojects.examples.title = Examples +qhp.Qt3DRenderer.subprojects.examples.indexTitle = Qt3D Examples +qhp.Qt3DRenderer.subprojects.examples.selectors = fake:example +qhp.Qt3DRenderer.subprojects.examples.sortPages = true + tagfile = ../../../doc/qt3drenderer/qt3drenderer.tags depends += qtcore qtqml qtquick qt3dcore qtdoc @@ -40,5 +50,6 @@ Cpp.ignoretokens += QT3DRENDERERSHARED_EXPORT \ Cpp.ignoredirectives += Q_DECLARE_LOGGING_CATEGORY -navigation.landingpage = "Qt3D Renderer" +navigation.landingpage = "Qt3D Module" navigation.cppclassespage = "Qt3D Renderer C++ Classes" +navigation.qmltypespage = "Qt3D Renderer QML Types" -- cgit v1.2.3