aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerome Pasion <jerome.pasion@digia.com>2012-12-03 16:35:35 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-03 16:38:37 +0100
commite03a879a68d3cb0906bab4dc81de8ac6ec017fa4 (patch)
tree26f87a2a329b6f3a4fa846df513a003f948baee0
parentacb9a7340b22cfda8bf6310c2fc9196c96cfc148 (diff)
Doc: Edited qdocconfig files to change QCH titles and redirects.
Task-number: QTBUG-28341 Change-Id: Iba37adc500794f18e90f0a9dd4a765a5c90d5e10 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
-rw-r--r--src/qml/doc/qtqml.qdocconf16
-rw-r--r--src/quick/doc/qtquick.qdocconf18
2 files changed, 17 insertions, 17 deletions
diff --git a/src/qml/doc/qtqml.qdocconf b/src/qml/doc/qtqml.qdocconf
index 301b6be660..5d958c8963 100644
--- a/src/qml/doc/qtqml.qdocconf
+++ b/src/qml/doc/qtqml.qdocconf
@@ -10,24 +10,22 @@ qhp.projects = QtQml
qhp.QtQml.file = qtqml.qhp
qhp.QtQml.namespace = org.qt-project.qtqml.500
qhp.QtQml.virtualFolder = qdoc
-qhp.QtQml.indexTitle = Qt QML Reference Documentation
+qhp.QtQml.indexTitle = Qt QML
qhp.QtQml.indexRoot =
qhp.QtQml.filterAttributes = qtqml 5.0.0 qtrefdoc
qhp.QtQml.customFilters.Qt.name = QtQml 5.0.0
qhp.QtQml.customFilters.Qt.filterAttributes = qtqml 5.0.0
-qhp.QtQml.subprojects = classes overviews examples
-qhp.QtQml.subprojects.classes.title = Classes
-qhp.QtQml.subprojects.classes.indexTitle = Qt QML's Classes
+qhp.QtQml.subprojects = classes examples
+qhp.QtQml.subprojects.classes.title = C++ Classes
+qhp.QtQml.subprojects.classes.indexTitle = Qt QML Module C++ Classes
qhp.QtQml.subprojects.classes.selectors = class fake:headerfile
qhp.QtQml.subprojects.classes.sortPages = true
-qhp.QtQml.subprojects.overviews.title = Overviews
-qhp.QtQml.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtQml.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtQml.subprojects.examples.title = Qt QML Examples
-qhp.QtQml.subprojects.examples.indexTitle = Qt QML Examples
+qhp.QtQml.subprojects.examples.title = Examples
+qhp.QtQml.subprojects.examples.indexTitle = Qt Quick Code Samples
qhp.QtQml.subprojects.examples.selectors = fake:example
+
tagfile = ../../../doc/qtqml/qtqml.tags
depends += qtcore qtxmlpatterns qtgui
diff --git a/src/quick/doc/qtquick.qdocconf b/src/quick/doc/qtquick.qdocconf
index 93aad5ddbf..8357a0734d 100644
--- a/src/quick/doc/qtquick.qdocconf
+++ b/src/quick/doc/qtquick.qdocconf
@@ -11,22 +11,24 @@ qhp.projects = QtQuick
qhp.QtQuick.file = qtquick.qhp
qhp.QtQuick.namespace = org.qt-project.qtquick.500
qhp.QtQuick.virtualFolder = qdoc
-qhp.QtQuick.indexTitle = Qt Quick Reference Documentation
+qhp.QtQuick.indexTitle = Qt Quick
qhp.QtQuick.indexRoot =
qhp.QtQuick.filterAttributes = qtquick 5.0.0 qtrefdoc
qhp.QtQuick.customFilters.Qt.name = QtQuick 5.0.0
qhp.QtQuick.customFilters.Qt.filterAttributes = qtquick 5.0.0
-qhp.QtQuick.subprojects = classes overviews examples
+qhp.QtQuick.subprojects = qmltypes classes examples
+qhp.QtQuick.subprojects.qmltypes.title = QML Types
+qhp.QtQuick.subprojects.qmltypes.indexTitle = Qt Quick QML Types
+qhp.QtQuick.subprojects.qmltypes.selectors = class fake:headerfile
+qhp.QtQuick.subprojects.qmltypes.sortPages = true
qhp.QtQuick.subprojects.classes.title = Classes
-qhp.QtQuick.subprojects.classes.indexTitle = Qt Quick's Classes
+qhp.QtQuick.subprojects.classes.title = C++ Classes
+qhp.QtQuick.subprojects.classes.indexTitle = Qt Quick Module C++ Classes
qhp.QtQuick.subprojects.classes.selectors = class fake:headerfile
qhp.QtQuick.subprojects.classes.sortPages = true
-qhp.QtQuick.subprojects.overviews.title = Overviews
-qhp.QtQuick.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtQuick.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtQuick.subprojects.examples.title = Qt Quick Examples
-qhp.QtQuick.subprojects.examples.indexTitle = Qt Quick Examples
+qhp.QtQuick.subprojects.examples.title = Examples
+qhp.QtQuick.subprojects.examples.indexTitle = Qt Quick Code Samples
qhp.QtQuick.subprojects.examples.selectors = fake:example
tagfile = ../../../doc/qtquick/qtquick.tags