summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@theqtcompany.com>2016-02-03 12:33:30 +0100
committerTopi Reiniƶ <topi.reinio@theqtcompany.com>2016-02-03 12:49:55 +0000
commit3fb7ce6a29ca69237c777cc65a3831768e938782 (patch)
tree94100cac2ecb9adf174a495fab7ac0ed7286abeb
parente3d37e846efc43d0af5641b5d7388efd5cc5d732 (diff)
Doc: Use a standard documentation config for a Qt modulev5.7.0-alpha1
- 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 <riitta-leena.miettinen@theqtcompany.com>
-rw-r--r--README2
-rw-r--r--src/datavisualization/doc/qtdatavisualization.qdocconf18
-rw-r--r--src/datavisualization/doc/src/qtdatavisualization-index.qdoc2
3 files changed, 6 insertions, 16 deletions
diff --git a/README b/README
index 57052420..4cdd3a7e 100644
--- a/README
+++ b/README
@@ -69,7 +69,7 @@ Both Qt Assistant (qtdatavisualization.qch) and in HTML format
(qtdatavisualization subfolder) documentation is generated.
Please refer to the generated documentation for more information:
- doc/qtdatavisualization/index.html
+ doc/qtdatavisualization/qtdatavisualization-index.html
Known Issues
============
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.