Commit e1bc9afb authored by Topi Reinio's avatar Topi Reinio Committed by Pasi Keränen
Browse files

Doc: Fix documentation configuration


Implement changes to make the documentation build as
part of the rest of the Qt reference.

    - Use the global Qt documentation template
      (qt-module-defaults.qdocconf)
    - Use the standard doc namespace
    - Fix QML type selector
    - Remove buildversion
    - Rename index page so that it doesn't collide with Qt
      reference documentation

Change-Id: I241d685d70a52026a0fc38739643254151e5969a
Reviewed-by: default avatarLeena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: default avatarTomi Korpipää <tomi.korpipaa@digia.com>
Reviewed-by: default avatarPasi Keränen <pasi.keranen@digia.com>
Showing with 4 additions and 10 deletions
include($QT_INSTALL_DOCS/global/macros.qdocconf) include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
include($QT_INSTALL_DOCS/global/qt-cpp-defines.qdocconf)
include($QT_INSTALL_DOCS/global/compat.qdocconf)
include($QT_INSTALL_DOCS/global/fileextensions.qdocconf)
include($QT_INSTALL_DOCS/global/qt-html-templates-offline.qdocconf)
project = QtCanvas3D project = QtCanvas3D
description = QML 3D Canvas Reference Documentation description = QML 3D Canvas Reference Documentation
...@@ -26,7 +22,7 @@ indexes += $QT_INSTALL_DOCS/qtcore/qtcore.index \ ...@@ -26,7 +22,7 @@ indexes += $QT_INSTALL_DOCS/qtcore/qtcore.index \
qhp.projects = QtCanvas3D qhp.projects = QtCanvas3D
qhp.QtCanvas3D.file = qtcanvas3d.qhp qhp.QtCanvas3D.file = qtcanvas3d.qhp
qhp.QtCanvas3D.namespace = com.digia.qtcanvas3d.100 qhp.QtCanvas3D.namespace = org.qt-project.qtcanvas3d.100
qhp.QtCanvas3D.virtualFolder = qtcanvas3d qhp.QtCanvas3D.virtualFolder = qtcanvas3d
qhp.QtCanvas3D.indexTitle = QML 3D Canvas qhp.QtCanvas3D.indexTitle = QML 3D Canvas
qhp.QtCanvas3D.indexRoot = qhp.QtCanvas3D.indexRoot =
...@@ -45,11 +41,9 @@ qhp.QtCanvas3D.subprojects.examples.selectors = fake:example ...@@ -45,11 +41,9 @@ qhp.QtCanvas3D.subprojects.examples.selectors = fake:example
qhp.QtCanvas3D.subprojects.examples.sortPages = true qhp.QtCanvas3D.subprojects.examples.sortPages = true
qhp.QtCanvas3D.subprojects.types.title = QML Types qhp.QtCanvas3D.subprojects.types.title = QML Types
qhp.QtCanvas3D.subprojects.types.indexTitle = QtCanvas3D QML Types qhp.QtCanvas3D.subprojects.types.indexTitle = QtCanvas3D QML Types
qhp.QtCanvas3D.subprojects.types.selectors = fake:qmlclass qhp.QtCanvas3D.subprojects.types.selectors = qmlclass
qhp.QtCanvas3D.subprojects.types.sortPages = true qhp.QtCanvas3D.subprojects.types.sortPages = true
navigation.landingpage = QML 3D Canvas navigation.landingpage = QML 3D Canvas
navigation.qmltypespage = QML Canvas 3D QML Types navigation.qmltypespage = QML Canvas 3D QML Types
navigation.examplespage = QML Canvas 3D Examples navigation.examplespage = QML Canvas 3D Examples
buildversion = QML 3D Canvas $QT_VERSION Reference Documentation
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/*! /*!
\title QtCanvas3D \title QtCanvas3D
\page index.html \page qtcanvas3d-index.html
\brief Provides functionality for 3D drawing inside Qt Quick 2. \brief Provides functionality for 3D drawing inside Qt Quick 2.
QtCanvas3D module provides a way to make OpenGL-like 3D drawing calls from Qt Quick JavaScript. QtCanvas3D module provides a way to make OpenGL-like 3D drawing calls from Qt Quick JavaScript.
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment