Doc: Cleaning up QHP information in module configuration files.

There is a common standard among all Qt modules. These changes affect
the final .qch file for each module.

Changes:
1)URL in qt-project.org is confirmed by DevNet maintainer
url = http://qt-project.org/doc/<module>

2)Landing page title mapping
indexTitle = landing page

3)"C++ Classes" as a child node.
The list of C++ classes and the titles are specified in the wiki.

4)Removed extra subprojects.
They are not needed for now. Each module may need additional nodes.

Change-Id: I1825476c21fe9aaddc9d6b512ff74229f17271a0
Reviewed-by: Martin Smith <martin.smith@digia.com>

diff --git a/src/concurrent/doc/qtconcurrent.qdocconf b/src/concurrent/doc/qtconcurrent.qdocconf
index b29c24b..9d761f4 100644 (file)
--- a/src/concurrent/doc/qtconcurrent.qdocconf
+++ b/src/concurrent/doc/qtconcurrent.qdocconf
@@ -2,31 +2,26 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtConcurrent
 description             = Qt Concurrent Reference Documentation
-url                     = http://qt-project.org/doc/qt-5.0/qtconcurrent
+url                     = http://qt-project.org/doc/qtconcurrent
 version                 = 5.0.0
 
 qhp.projects            = QtConcurrent
 
 qhp.QtConcurrent.file         = qtconcurrent.qhp
 qhp.QtConcurrent.namespace           = org.qt-project.qtconcurrent.500
-qhp.QtConcurrent.virtualFolder       = qdoc
-qhp.QtConcurrent.indexTitle          = Qt Concurrent Reference Documentation
+qhp.QtConcurrent.virtualFolder       = qtconcurrent
+qhp.QtConcurrent.indexTitle          = Qt Concurrent
 qhp.QtConcurrent.indexRoot           =
 
 qhp.QtConcurrent.filterAttributes    = qtconcurrent 5.0.0 qtrefdoc
 qhp.QtConcurrent.customFilters.Qt.name = QtConcurrent 5.0.0
 qhp.QtConcurrent.customFilters.Qt.filterAttributes = qtconcurrent 5.0.0
-qhp.QtConcurrent.subprojects         = classes overviews examples
-qhp.QtConcurrent.subprojects.classes.title = Classes
-qhp.QtConcurrent.subprojects.classes.indexTitle = Qt Concurrent's Classes
+
+qhp.QtConcurrent.subprojects         = classes
+qhp.QtConcurrent.subprojects.classes.title = C++ Classes
+qhp.QtConcurrent.subprojects.classes.indexTitle = Qt Concurrent C++ Classes
 qhp.QtConcurrent.subprojects.classes.selectors = class fake:headerfile
 qhp.QtConcurrent.subprojects.classes.sortPages = true
-qhp.QtConcurrent.subprojects.overviews.title = Overviews
-qhp.QtConcurrent.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtConcurrent.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtConcurrent.subprojects.examples.title = Qt Concurrent Examples
-qhp.QtConcurrent.subprojects.examples.indexTitle = Qt Concurrent Examples
-qhp.QtConcurrent.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtconcurrent/qtconcurrent.tags
 

diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index 2b0dc6e..6172799 100644 (file)
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -2,31 +2,25 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtCore
 description             = Qt Core Reference Documentation
-url                     = http://qt-project.org/doc/qt-5.0/qtcore
+url                     = http://qt-project.org/doc/qtcore
 version                 = 5.0.0
 
 qhp.projects            = QtCore
 
 qhp.QtCore.file                = qtcore.qhp
 qhp.QtCore.namespace           = org.qt-project.qtcore.500
-qhp.QtCore.virtualFolder       = qdoc
-qhp.QtCore.indexTitle          = Qt Core Reference Documentation
+qhp.QtCore.virtualFolder       = qtcore
+qhp.QtCore.indexTitle          = Qt Core
 qhp.QtCore.indexRoot           =
 
 qhp.QtCore.filterAttributes    = qtcore 5.0.0 qtrefdoc
 qhp.QtCore.customFilters.Qt.name = QtCore 5.0.0
 qhp.QtCore.customFilters.Qt.filterAttributes = qtcore 5.0.0
-qhp.QtCore.subprojects         = classes overviews examples
-qhp.QtCore.subprojects.classes.title = Classes
-qhp.QtCore.subprojects.classes.indexTitle = Qt Core's Classes
+qhp.QtCore.subprojects         = classes
+qhp.QtCore.subprojects.classes.title = C++ Classes
+qhp.QtCore.subprojects.classes.indexTitle = Qt Core C++ Classes
 qhp.QtCore.subprojects.classes.selectors = class fake:headerfile
 qhp.QtCore.subprojects.classes.sortPages = true
-qhp.QtCore.subprojects.overviews.title = Overviews
-qhp.QtCore.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtCore.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtCore.subprojects.examples.title = Qt Core Examples
-qhp.QtCore.subprojects.examples.indexTitle = Qt Core Examples
-qhp.QtCore.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtcore/qtcore.tags
 

diff --git a/src/dbus/doc/qtdbus.qdocconf b/src/dbus/doc/qtdbus.qdocconf
index 07fe2ff..4fc489f 100644 (file)
--- a/src/dbus/doc/qtdbus.qdocconf
+++ b/src/dbus/doc/qtdbus.qdocconf
@@ -2,31 +2,26 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtDBus
 description             = Qt DBus Reference Documentation
-url                     = http://qt-project.org/doc/qt-5.0/qtdbus
+url                     = http://qt-project.org/doc/qtdbus
 version                 = 5.0.0
 
 qhp.projects            = QtDBus
 
 qhp.QtDBus.file         = qtdbus.qhp
 qhp.QtDBus.namespace           = org.qt-project.qtdbus.500
-qhp.QtDBus.virtualFolder       = qdoc
-qhp.QtDBus.indexTitle          = Qt DBus Reference Documentation
+qhp.QtDBus.virtualFolder       = qtdbus
+qhp.QtDBus.indexTitle          = Qt D-Bus
 qhp.QtDBus.indexRoot           =
 
 qhp.QtDBus.filterAttributes    = qtdbus 5.0.0 qtrefdoc
 qhp.QtDBus.customFilters.Qt.name = QtDBus 5.0.0
 qhp.QtDBus.customFilters.Qt.filterAttributes = qtdbus 5.0.0
-qhp.QtDBus.subprojects         = classes overviews examples
-qhp.QtDBus.subprojects.classes.title = Classes
-qhp.QtDBus.subprojects.classes.indexTitle = Qt DBus' Classes
+
+qhp.QtDBus.subprojects         = classes
+qhp.QtDBus.subprojects.classes.title = C++ Classes
+qhp.QtDBus.subprojects.classes.indexTitle = Qt D-Bus C++ Classes
 qhp.QtDBus.subprojects.classes.selectors = class fake:headerfile
 qhp.QtDBus.subprojects.classes.sortPages = true
-qhp.QtDBus.subprojects.overviews.title = Overviews
-qhp.QtDBus.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtDBus.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtDBus.subprojects.examples.title = Qt DBus Examples
-qhp.QtDBus.subprojects.examples.indexTitle = Qt DBus Examples
-qhp.QtDBus.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtdbus/qtdbus.tags
 

diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
index 731f472..074286b 100644 (file)
--- a/src/gui/doc/qtgui.qdocconf
+++ b/src/gui/doc/qtgui.qdocconf
@@ -2,31 +2,26 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtGui
 description             = Qt GUI Reference Documentation
-url                     = http://qt-project.org/doc/qt-5.0/qtgui
+url                     = http://qt-project.org/doc/qtgui
 version                 = 5.0.0
 
 qhp.projects            = QtGui
 
 qhp.QtGui.file         = qtgui.qhp
 qhp.QtGui.namespace           = org.qt-project.qtgui.500
-qhp.QtGui.virtualFolder       = qdoc
-qhp.QtGui.indexTitle          = Qt GUI Reference Documentation
+qhp.QtGui.virtualFolder       = qtgui
+qhp.QtGui.indexTitle          = Qt GUI
 qhp.QtGui.indexRoot           =
 
 qhp.QtGui.filterAttributes    = qtgui 5.0.0 qtrefdoc
 qhp.QtGui.customFilters.Qt.name = Qtgui 5.0.0
 qhp.QtGui.customFilters.Qt.filterAttributes = qtgui 5.0.0
-qhp.QtGui.subprojects         = classes overviews examples
-qhp.QtGui.subprojects.classes.title = Classes
-qhp.QtGui.subprojects.classes.indexTitle = Qt GUI's Classes
+
+qhp.QtGui.subprojects         = classes
+qhp.QtGui.subprojects.classes.title = C++ Classes
+qhp.QtGui.subprojects.classes.indexTitle = Qt GUI C++ Classes
 qhp.QtGui.subprojects.classes.selectors = class fake:headerfile
 qhp.QtGui.subprojects.classes.sortPages = true
-qhp.QtGui.subprojects.overviews.title = Overviews
-qhp.QtGui.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtGui.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtGui.subprojects.examples.title = Qt GUI Examples
-qhp.QtGui.subprojects.examples.indexTitle = Qt GUI Examples
-qhp.QtGui.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtgui/qtgui.tags
 

diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf
index 808ab68..d15927b 100644 (file)
--- a/src/network/doc/qtnetwork.qdocconf
+++ b/src/network/doc/qtnetwork.qdocconf
@@ -2,31 +2,26 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtNetwork
 description             = Qt Network Reference Documentation
-url                     = http://qt-project.org/doc/qt-5.0/qtnetwork
+url                     = http://qt-project.org/doc/qtnetwork
 version                 = 5.0.0
 
 qhp.projects            = QtNetwork
 
 qhp.QtNetwork.file         = qtnetwork.qhp
 qhp.QtNetwork.namespace           = org.qt-project.qtnetwork.500
-qhp.QtNetwork.virtualFolder       = qdoc
-qhp.QtNetwork.indexTitle          = Qt Network Reference Documentation
+qhp.QtNetwork.virtualFolder       = qtnetwork
+qhp.QtNetwork.indexTitle          = Qt Network
 qhp.QtNetwork.indexRoot           =
 
 qhp.QtNetwork.filterAttributes    = qtnetwork 5.0.0 qtrefdoc
 qhp.QtNetwork.customFilters.Qt.name = QtNetwork 5.0.0
 qhp.QtNetwork.customFilters.Qt.filterAttributes = qtnetwork 5.0.0
-qhp.QtNetwork.subprojects         = classes overviews examples
-qhp.QtNetwork.subprojects.classes.title = Classes
-qhp.QtNetwork.subprojects.classes.indexTitle = Qt Network's Classes
+
+qhp.QtNetwork.subprojects         = classes
+qhp.QtNetwork.subprojects.classes.title = C++ Classes
+qhp.QtNetwork.subprojects.classes.indexTitle = Qt Network C++ Classes
 qhp.QtNetwork.subprojects.classes.selectors = class fake:headerfile
 qhp.QtNetwork.subprojects.classes.sortPages = true
-qhp.QtNetwork.subprojects.overviews.title = Overviews
-qhp.QtNetwork.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtNetwork.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtNetwork.subprojects.examples.title = Qt Network Examples
-qhp.QtNetwork.subprojects.examples.indexTitle = Qt Network Examples
-qhp.QtNetwork.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtnetwork/qtnetwork.tags
 

diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf
index 64806a6..bdb6a9e 100644 (file)
--- a/src/opengl/doc/qtopengl.qdocconf
+++ b/src/opengl/doc/qtopengl.qdocconf
@@ -2,31 +2,26 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtOpenGL
 description             = Qt OpenGL Reference Documentation
-url                     = http://qt-project.org/doc/qt-5.0/qtopengl
+url                     = http://qt-project.org/doc/qtopengl
 version                 = 5.0.0
 
 qhp.projects            = QtOpenGL
 
 qhp.QtOpenGL.file         = qtopengl.qhp
 qhp.QtOpenGL.namespace           = org.qt-project.qtopengl.500
-qhp.QtOpenGL.virtualFolder       = qdoc
-qhp.QtOpenGL.indexTitle          = Qt OpenGL Reference Documentation
+qhp.QtOpenGL.virtualFolder       = qtopengl
+qhp.QtOpenGL.indexTitle          = Qt OpenGL
 qhp.QtOpenGL.indexRoot           =
 
 qhp.QtOpenGL.filterAttributes    = qtopengl 5.0.0 qtrefdoc
 qhp.QtOpenGL.customFilters.Qt.name = QtOpenGL 5.0.0
 qhp.QtOpenGL.customFilters.Qt.filterAttributes = qtopengl 5.0.0
-qhp.QtOpenGL.subprojects         = classes overviews examples
-qhp.QtOpenGL.subprojects.classes.title = Classes
-qhp.QtOpenGL.subprojects.classes.indexTitle = Qt OpenGL's Classes
+
+qhp.QtOpenGL.subprojects         = classes
+qhp.QtOpenGL.subprojects.classes.title = C++ Classes
+qhp.QtOpenGL.subprojects.classes.indexTitle = Qt OpenGL C++ Classes
 qhp.QtOpenGL.subprojects.classes.selectors = class fake:headerfile
 qhp.QtOpenGL.subprojects.classes.sortPages = true
-qhp.QtOpenGL.subprojects.overviews.title = Overviews
-qhp.QtOpenGL.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtOpenGL.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtOpenGL.subprojects.examples.title = Qt OpenGL Examples
-qhp.QtOpenGL.subprojects.examples.indexTitle = Qt OpenGL Examples
-qhp.QtOpenGL.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtopengl/qtopengl.tags
 

diff --git a/src/printsupport/doc/qtprintsupport.qdocconf b/src/printsupport/doc/qtprintsupport.qdocconf
index c3e8ac0..321d73e 100644 (file)
--- a/src/printsupport/doc/qtprintsupport.qdocconf
+++ b/src/printsupport/doc/qtprintsupport.qdocconf
@@ -2,31 +2,26 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtPrintSupport
 description             = Qt Print Support Reference Documentation
-url                     = http://qt-project.org/doc/qt-5.0/qtprintsupport
+url                     = http://qt-project.org/doc/qtprintsupport
 version                 = 5.0.0
 
 qhp.projects            = QtPrintSupport
 
 qhp.QtPrintSupport.file         = qtprintsupport.qhp
 qhp.QtPrintSupport.namespace           = org.qt-project.qtprintsupport.500
-qhp.QtPrintSupport.virtualFolder       = qdoc
-qhp.QtPrintSupport.indexTitle          = Qt Print Support Reference Documentation
+qhp.QtPrintSupport.virtualFolder       = qtprintsupport
+qhp.QtPrintSupport.indexTitle          = Qt Print Support
 qhp.QtPrintSupport.indexRoot           =
 
 qhp.QtPrintSupport.filterAttributes    = qtprintsupport 5.0.0 qtrefdoc
 qhp.QtPrintSupport.customFilters.Qt.name = QtPrintSupport 5.0.0
 qhp.QtPrintSupport.customFilters.Qt.filterAttributes = qtprintsupport 5.0.0
-qhp.QtPrintSupport.subprojects         = classes overviews examples
-qhp.QtPrintSupport.subprojects.classes.title = Classes
-qhp.QtPrintSupport.subprojects.classes.indexTitle = Qt Print Support's Classes
+
+qhp.QtPrintSupport.subprojects         = classes
+qhp.QtPrintSupport.subprojects.classes.title = C++ Classes
+qhp.QtPrintSupport.subprojects.classes.indexTitle = Qt Print Support C++ Classes
 qhp.QtPrintSupport.subprojects.classes.selectors = class fake:headerfile
 qhp.QtPrintSupport.subprojects.classes.sortPages = true
-qhp.QtPrintSupport.subprojects.overviews.title = Overviews
-qhp.QtPrintSupport.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtPrintSupport.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtPrintSupport.subprojects.examples.title = Qt Print Support Examples
-qhp.QtPrintSupport.subprojects.examples.indexTitle = Qt Print Support Examples
-qhp.QtPrintSupport.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtprintsupport/qtprintsupport.tags
 

diff --git a/src/sql/doc/qtsql.qdocconf b/src/sql/doc/qtsql.qdocconf
index 736f9c9..e6ed9d6 100644 (file)
--- a/src/sql/doc/qtsql.qdocconf
+++ b/src/sql/doc/qtsql.qdocconf
@@ -2,32 +2,26 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtSql
 description             = Qt SQL Reference Documentation
-url                     = http://qt-project.org/doc/qt-5.0/qtsql
+url                     = http://qt-project.org/doc/qtsql
 version                 = 5.0.0
 
 qhp.projects            = QtSql
 
 qhp.QtSql.file            = qtsql.qhp
 qhp.QtSql.namespace           = org.qt-project.qtsql.500
-qhp.QtSql.virtualFolder       = qdoc
-qhp.QtSql.indexTitle          = Qt SQL Reference Documentation
+qhp.QtSql.virtualFolder       = qtsql
+qhp.QtSql.indexTitle          = Qt SQL
 qhp.QtSql.indexRoot           =
 
 qhp.QtSql.filterAttributes    = qtsql 5.0.0 qtrefdoc
 qhp.QtSql.customFilters.Qt.name = QtSql 5.0.0
 qhp.QtSql.customFilters.Qt.filterAttributes = qtsql 5.0.0
-qhp.QtSql.subprojects         = classes overviews examples
-qhp.QtSql.subprojects.classes.title = Classes
-qhp.QtSql.subprojects.classes.indexTitle = Qt SQL's Classes
+
+qhp.QtSql.subprojects         = classes
+qhp.QtSql.subprojects.classes.title = C++ Classes
+qhp.QtSql.subprojects.classes.indexTitle = Qt SQL C++ Classes
 qhp.QtSql.subprojects.classes.selectors = class fake:headerfile
 qhp.QtSql.subprojects.classes.sortPages = true
-qhp.QtSql.subprojects.overviews.title = Overviews
-qhp.QtSql.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtSql.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtSql.subprojects.examples.title = Qt SQL Examples
-qhp.QtSql.subprojects.examples.indexTitle = Qt SQL Examples
-qhp.QtSql.subprojects.examples.selectors = fake:example
-
 tagfile                 = ../../../doc/qtsql/qtsql.tags
 
 depends                 += qtcore qtwidgets qtdoc

diff --git a/src/testlib/doc/qttest.qdocconf b/src/testlib/doc/qttest.qdocconf
index e299e26..ff36e43 100644 (file)
--- a/src/testlib/doc/qttest.qdocconf
+++ b/src/testlib/doc/qttest.qdocconf
@@ -2,31 +2,26 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtTest
 description             = Qt Test Reference Documentation
-url                     = http://qt-project.org/doc/qt-5.0/qttest
+url                     = http://qt-project.org/doc/qttest
 version                 = 5.0.0
 
 qhp.projects            = QtTest
 
 qhp.QtTest.file                = qttest.qhp
 qhp.QtTest.namespace           = org.qt-project.qttest.500
-qhp.QtTest.virtualFolder       = qdoc
-qhp.QtTest.indexTitle          = Qt Test Reference Documentation
+qhp.QtTest.virtualFolder       = qttest
+qhp.QtTest.indexTitle          = Qt Test
 qhp.QtTest.indexRoot           =
 
 qhp.QtTest.filterAttributes    = qttest 5.0.0 qtrefdoc
 qhp.QtTest.customFilters.Qt.name = QtTest 5.0.0
 qhp.QtTest.customFilters.Qt.filterAttributes = qttest 5.0.0
-qhp.QtTest.subprojects         = classes overviews examples
-qhp.QtTest.subprojects.classes.title = Classes
-qhp.QtTest.subprojects.classes.indexTitle = Qt Test's Classes
+
+qhp.QtTest.subprojects         = classes
+qhp.QtTest.subprojects.classes.title = C++ Classes
+qhp.QtTest.subprojects.classes.indexTitle = Qt Test C++ Classes
 qhp.QtTest.subprojects.classes.selectors = class fake:headerfile
 qhp.QtTest.subprojects.classes.sortPages = true
-qhp.QtTest.subprojects.overviews.title = Overviews
-qhp.QtTest.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtTest.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtTest.subprojects.examples.title = Qt Test Examples
-qhp.QtTest.subprojects.examples.indexTitle = Qt Test Examples
-qhp.QtTest.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qttest/qttest.tags
 

diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf
index 52946fe..1bdc96a 100644 (file)
--- a/src/widgets/doc/qtwidgets.qdocconf
+++ b/src/widgets/doc/qtwidgets.qdocconf
@@ -2,31 +2,26 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtWidgets
 description             = Qt Widgets Reference Documentation
-url                     = http://qt-project.org/doc/qt-5.0/qtwidgets
+url                     = http://qt-project.org/doc/qtwidgets
 version                 = 5.0.0
 
 qhp.projects            = QtWidgets
 
 qhp.QtWidgets.file         = qtwidgets.qhp
 qhp.QtWidgets.namespace           = org.qt-project.qtwidgets.500
-qhp.QtWidgets.virtualFolder       = qdoc
-qhp.QtWidgets.indexTitle          = Qt Widgets Reference Documentation
+qhp.QtWidgets.virtualFolder       = qtwidgets
+qhp.QtWidgets.indexTitle          = Qt Widgets
 qhp.QtWidgets.indexRoot           =
 
 qhp.QtWidgets.filterAttributes    = qtwidgets 5.0.0 qtrefdoc
 qhp.QtWidgets.customFilters.Qt.name = QtWidgets 5.0.0
 qhp.QtWidgets.customFilters.Qt.filterAttributes = qtwidgets 5.0.0
-qhp.QtWidgets.subprojects         = classes overviews examples
-qhp.QtWidgets.subprojects.classes.title = Classes
-qhp.QtWidgets.subprojects.classes.indexTitle = Qt Widgets' Classes
+
+qhp.QtWidgets.subprojects         = classes
+qhp.QtWidgets.subprojects.classes.title = C++ Classes
+qhp.QtWidgets.subprojects.classes.indexTitle = Qt Widgets C++ Classes
 qhp.QtWidgets.subprojects.classes.selectors = class fake:headerfile
 qhp.QtWidgets.subprojects.classes.sortPages = true
-qhp.QtWidgets.subprojects.overviews.title = Overviews
-qhp.QtWidgets.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtWidgets.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtWidgets.subprojects.examples.title = Qt Widgets Examples
-qhp.QtWidgets.subprojects.examples.indexTitle = Qt Widgets Examples
-qhp.QtWidgets.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtwidgets/qtwidgets.tags
 

diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf
index 112d8e8..038993a 100644 (file)
--- a/src/xml/doc/qtxml.qdocconf
+++ b/src/xml/doc/qtxml.qdocconf
@@ -2,31 +2,26 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf)
 
 project                 = QtXml
 description             = Qt XML Reference Documentation
-url                     = http://qt-project.org/doc/qt-5.0/qtxml
+url                     = http://qt-project.org/doc/qtxml
 version                 = 5.0.0
 
 qhp.projects            = QtXml
 
 qhp.QtXml.file            = qtxml.qhp
 qhp.QtXml.namespace           = org.qt-project.qtxml.500
-qhp.QtXml.virtualFolder       = qdoc
-qhp.QtXml.indexTitle          = Qt XML Reference Documentation
+qhp.QtXml.virtualFolder       = qtxml
+qhp.QtXml.indexTitle          = Qt XML
 qhp.QtXml.indexRoot           =
 
 qhp.QtXml.filterAttributes    = qtxml 5.0.0 qtrefdoc
 qhp.QtXml.customFilters.Qt.name = QtXml 5.0.0
 qhp.QtXml.customFilters.Qt.filterAttributes = qtxml 5.0.0
-qhp.QtXml.subprojects         = classes overviews examples
-qhp.QtXml.subprojects.classes.title = Classes
-qhp.QtXml.subprojects.classes.indexTitle = Qt XML's Classes
+
+qhp.QtXml.subprojects         = classes
+qhp.QtXml.subprojects.classes.title = C++ Classes
+qhp.QtXml.subprojects.classes.indexTitle = Qt XML C++ Classes
 qhp.QtXml.subprojects.classes.selectors = class fake:headerfile
 qhp.QtXml.subprojects.classes.sortPages = true
-qhp.QtXml.subprojects.overviews.title = Overviews
-qhp.QtXml.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.QtXml.subprojects.overviews.selectors = fake:page,group,module
-qhp.QtXml.subprojects.examples.title = Qt XML Examples
-qhp.QtXml.subprojects.examples.indexTitle = Qt XML Examples
-qhp.QtXml.subprojects.examples.selectors = fake:example
 
 tagfile                 = ../../../doc/qtxml/qtxml.tags