From 3fb7ce6a29ca69237c777cc65a3831768e938782 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 3 Feb 2016 12:33:30 +0100 Subject: Doc: Use a standard documentation config for a Qt module - Rename index.html to qtdatavisualization-index.html - Use the qt-module-defaults global doc template - Convert 'indexes' into 'depends' - Remove custom buildversion string - Use a namespace consistent with the rest of Qt modules - Update examplesinstallpath to the changes introduced in Qt 5.6 packaging. Change-Id: I0a2db65861181c967ff4ac8ec50949bea8f03101 Reviewed-by: Leena Miettinen --- src/datavisualization/doc/qtdatavisualization.qdocconf | 18 ++++-------------- .../doc/src/qtdatavisualization-index.qdoc | 2 +- 2 files changed, 5 insertions(+), 15 deletions(-) (limited to 'src/datavisualization') diff --git a/src/datavisualization/doc/qtdatavisualization.qdocconf b/src/datavisualization/doc/qtdatavisualization.qdocconf index db7c684a..873e33a0 100644 --- a/src/datavisualization/doc/qtdatavisualization.qdocconf +++ b/src/datavisualization/doc/qtdatavisualization.qdocconf @@ -1,8 +1,4 @@ -include($QT_INSTALL_DOCS/global/macros.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) +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtDataVisualization description = Qt Data Visualization Reference Documentation @@ -16,18 +12,14 @@ imagedirs += ../images \ images sourcedirs += .. -examplesinstallpath = datavisualization +examplesinstallpath = qtdatavisualization/datavisualization -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/qtmultimedia/qtmultimedia.index +depends = qtcore qtgui qtqml qtquick qtmultimedia qtdoc qhp.projects = QtDataVisualization qhp.QtDataVisualization.file = qtdatavisualization.qhp -qhp.QtDataVisualization.namespace = com.digia.qtdatavisualization.$QT_VERSION_TAG +qhp.QtDataVisualization.namespace = org.qt-project.qtdatavisualization.$QT_VERSION_TAG qhp.QtDataVisualization.virtualFolder = qtdatavisualization qhp.QtDataVisualization.indexTitle = Qt Data Visualization qhp.QtDataVisualization.indexRoot = @@ -56,5 +48,3 @@ qhp.QtDataVisualization.subprojects.types.sortPages = true navigation.landingpage = Qt Data Visualization navigation.cppclassespage = Qt Data Visualization C++ Classes navigation.qmltypespage = Qt Data Visualization QML Types - -buildversion = Qt Data Visualization $QT_VERSION Reference Documentation diff --git a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc index 1bfa70d0..e97f2200 100644 --- a/src/datavisualization/doc/src/qtdatavisualization-index.qdoc +++ b/src/datavisualization/doc/src/qtdatavisualization-index.qdoc @@ -29,7 +29,7 @@ /*! \title Qt Data Visualization - \page index.html + \page qtdatavisualization-index.html \brief Provides functionality for 3D visualization. Qt Data Visualization module provides a way to visualize data in 3D. -- cgit v1.2.3