summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-11-06 13:04:25 +0100
committerVenugopal Shivashankar <venugopal.shivashankar@digia.com>2015-11-11 15:27:30 +0000
commitf484c14f8094ef29f904a947538f9556a4bcab3b (patch)
tree395d388f0fbe08c1149b57b43c3ff92599dac3bb /src
parent80c92e403f3a167da3e4e3b55c0311a1ff333b0e (diff)
Doc: Change a few parameter values in the qdocconf
The waylandcompositor API will be part of Qt so the docs for it should use the Qt reference documentation URL and version. The index page for the module cannot be named 'index.html' as it conflicts with the Qt reference doc main page. Change-Id: I3d8c45dac7a896e9bd6a2ab5f1c6d4f7018810ed Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/compositor/doc/compositor.qdocconf19
-rw-r--r--src/compositor/doc/src/qtwaylandcompositor-overview.qdoc2
2 files changed, 9 insertions, 12 deletions
diff --git a/src/compositor/doc/compositor.qdocconf b/src/compositor/doc/compositor.qdocconf
index cca12a541..125fb2b31 100644
--- a/src/compositor/doc/compositor.qdocconf
+++ b/src/compositor/doc/compositor.qdocconf
@@ -2,19 +2,18 @@ include($QT_INSTALL_DOCS/global//qt-module-defaults.qdocconf)
project = QtWaylandCompositor
description = Qt Wayland Compositor Reference Documentation
-url = http://doc.qt.io/QtWaylandCompositor/
-version = 1.0.0
+version = $QT_VERSION
qhp.projects = QtWaylandCompositor
qhp.QtWaylandCompositor.file = qtwaylandcompositor.qhp
-qhp.QtWaylandCompositor.namespace = org.qtproject.qtwaylandcompositor.1.0
+qhp.QtWaylandCompositor.namespace = org.qtproject.qtwaylandcompositor.$QT_VERSION_TAG
qhp.QtWaylandCompositor.virtualFolder = qtwaylandcompositor
qhp.QtWaylandCompositor.indexTitle = Qt Wayland Compositor
qhp.QtWaylandCompositor.indexRoot =
-qhp.QtWaylandCompositor.filterAttributes = qtwaylandcompositor 1.0 qtrefdoc
-qhp.QtWaylandCompositor.customFilters.Qt.name = QtWaylandCompositor 1.0
-qhp.QtWaylandCompositor.customFilters.Qt.filterAttributes = qtwaylandcompositor 1.0
+qhp.QtWaylandCompositor.filterAttributes = qtwaylandcompositor $QT_VERSION qtrefdoc
+qhp.QtWaylandCompositor.customFilters.Qt.name = QtWaylandCompositor $QT_VERSION
+qhp.QtWaylandCompositor.customFilters.Qt.filterAttributes = qtwaylandcompositor $QT_VERSION
qhp.QtWaylandCompositor.subprojects = qmltypes classes examples
qhp.QtWaylandCompositor.subprojects.qmltypes.title = QML Types
@@ -28,11 +27,9 @@ qhp.QtWaylandCompositor.subprojects.classes.sortPages = true
qhp.QtWaylandCompositor.subprojects.examples.title = Examples
qhp.QtWaylandCompositor.subprojects.examples.indexTitle = Qt Wayland Compositor Examples
qhp.QtWaylandCompositor.subprojects.examples.selectors = fake:example
+qhp.QtWaylandCompositor.subprojects.examples.sortPages = true
-indexes += $QT_INSTALL_DOCS/qtqml/qtqml.index \
- $QT_INSTALL_DOCS/qtquick/qtquick.index \
- $QT_INSTALL_DOCS/qtdoc/qtdoc.index \
- $QT_INSTALL_DOCS/qtquickcontrols/qtquickcontrols.index
+depends += qtqml qtquick qtdoc qtquickcontrols
exampledirs += ../../../examples/wayland/
headerdirs += ../
@@ -44,4 +41,4 @@ examplesinstallpath = waylandcompositor
navigation.landingpage = "Qt Wayland Compositor"
navigation.qmltypespage = "Qt Wayland Compositor QML Types"
navigation.cppclassespage = "Qt Wayland Compositor C++ Classes"
-buildversion = "Qt Wayland Compositor 1.0"
+navigation.homepage = "Qt Documentation (Technology Preview)"
diff --git a/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc b/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc
index 0fc89e6bd..9811d5205 100644
--- a/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc
+++ b/src/compositor/doc/src/qtwaylandcompositor-overview.qdoc
@@ -26,7 +26,7 @@
****************************************************************************/
/*!
- \page index.html
+ \page qtwaylandcompositor-index.html
\title Qt Wayland Compositor
\brief An API to develop display servers supporting the Wayland protocol