Add "make docs" target for QtNetwork and sanitize other qdocconfs.

Change-Id: Ic9d6384b20162debeb69cb067c96c330c0fd999a
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>

diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index 31b53c9..f788b36 100644 (file)
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -10,26 +10,26 @@ outputencoding          = UTF-8
 naturallanguage         = en_US
 qhp.projects            = QtCore
 
-qhp.QtCore.file            = qtcore.qhp
-qhp.Qt.namespace           = org.qt-project.qtcore.500
-qhp.Qt.virtualFolder       = qdoc
-qhp.Qt.indexTitle          = Qt Core Reference Documentation
-qhp.Qt.indexRoot           =
-
-qhp.Qt.filterAttributes    = qtcore 5.0.0 qtrefdoc
-qhp.Qt.customFilters.Qt.name = QtCore 5.0.0
-qhp.Qt.customFilters.Qt.filterAttributes = qtcore 5.0.0
-qhp.Qt.subprojects         = classes overviews examples
-qhp.Qt.subprojects.classes.title = Classes
-qhp.Qt.subprojects.classes.indexTitle = Qt Core's Classes
-qhp.Qt.subprojects.classes.selectors = class fake:headerfile
-qhp.Qt.subprojects.classes.sortPages = true
-qhp.Qt.subprojects.overviews.title = Overviews
-qhp.Qt.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.Qt.subprojects.overviews.selectors = fake:page,group,module
-qhp.Qt.subprojects.examples.title = Qt Core Tutorials and Examples
-qhp.Qt.subprojects.examples.indexTitle = Qt Core Examples
-qhp.Qt.subprojects.examples.selectors = fake:example
+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.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.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
 
 dita.metadata.default.author      = Qt Project
 dita.metadata.default.permissions = all

diff --git a/src/network/doc/doc.pri b/src/network/doc/doc.pri
new file mode 100644 (file)
index 0000000..7ca0ad0
--- /dev/null
+++ b/src/network/doc/doc.pri
@@ -0,0 +1,3 @@
+qtPrepareTool(QDOC, qdoc)
+docs.commands += $$QDOC $$QT.network.sources/doc/qtnetwork.qdocconf
+QMAKE_EXTRA_TARGETS += docs

diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf
new file mode 100644 (file)
index 0000000..2e58ad6
--- /dev/null
+++ b/src/network/doc/qtnetwork.qdocconf
@@ -0,0 +1,92 @@
+include(../../../doc/global/qt-cpp-ignore.qdocconf)
+
+project                 = QtNetwork
+description             = Qt Network Reference Documentation
+url                     = http://qt-project.org/doc/qt-5.0/qtsql
+version                 = 5.0.0
+
+sourceencoding          = UTF-8
+outputencoding          = UTF-8
+naturallanguage         = en_US
+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.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.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
+
+dita.metadata.default.author      = Qt Project
+dita.metadata.default.permissions = all
+dita.metadata.default.publisher   = Qt Project
+dita.metadata.default.copyryear = 2012
+dita.metadata.default.copyrholder = Nokia
+dita.metadata.default.audience = programmer
+
+sources.fileextensions  = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
+headers.fileextensions  = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
+examples.imageextensions = "*.png"
+
+outputdir               = ../../../doc/qtnetwork
+tagfile                 = ../../../doc/qtnetwork/qtnetwork.tags
+
+HTML.generatemacrefs    = "true"
+HTML.nobreadcrumbs      = "true"
+
+HTML.templatedir = .
+
+HTML.stylesheets = ../../../doc/global/style/offline.css
+
+HTML.headerstyles = \
+    "  <link rel=\"stylesheet\" type=\"text/css\" href=\"style/offline.css\" />\n"
+
+HTML.endheader = \
+    "</head>\n" \
+
+defines                 = Q_QDOC \
+                          QT_.*_SUPPORT \
+                          QT_.*_LIB \
+                          QT_COMPAT \
+                          QT_KEYPAD_NAVIGATION \
+                          QT_NO_EGL \
+                          Q_WS_.* \
+                          Q_OS_.* \
+                          Q_BYTE_ORDER \
+                          QT_DEPRECATED \
+                          QT_DEPRECATED_* \
+                          Q_NO_USING_KEYWORD \
+                          __cplusplus \
+                          Q_COMPILER_INITIALIZER_LISTS
+
+versionsym              = QT_VERSION_STR
+
+codeindent              = 1
+
+depends                 += qtcore
+
+headerdirs  += ..
+
+sourcedirs  += ..
+
+exampledirs += ../../../examples \
+               ../ \
+               snippets
+
+imagedirs   += images

diff --git a/src/network/network.pro b/src/network/network.pro
index 671b7fd..a659733 100644 (file)
--- a/src/network/network.pro
+++ b/src/network/network.pro
@@ -26,6 +26,7 @@ HEADERS += $$QT_SOURCE_TREE/src/network/qtnetworkversion.h
 
 include(access/access.pri)
 include(bearer/bearer.pri)
+include(doc/doc.pri)
 include(kernel/kernel.pri)
 include(socket/socket.pri)
 include(ssl/ssl.pri)

diff --git a/src/sql/doc/qtsql.qdocconf b/src/sql/doc/qtsql.qdocconf
index 85e0cfc..ac0249a 100644 (file)
--- a/src/sql/doc/qtsql.qdocconf
+++ b/src/sql/doc/qtsql.qdocconf
@@ -10,26 +10,26 @@ outputencoding          = UTF-8
 naturallanguage         = en_US
 qhp.projects            = QtSql
 
-qhp.QtCore.file            = qtsql.qhp
-qhp.Qt.namespace           = org.qt-project.qtsql.500
-qhp.Qt.virtualFolder       = qdoc
-qhp.Qt.indexTitle          = Qt SQL Reference Documentation
-qhp.Qt.indexRoot           =
-
-qhp.Qt.filterAttributes    = qtsql 5.0.0 qtrefdoc
-qhp.Qt.customFilters.Qt.name = QtSql 5.0.0
-qhp.Qt.customFilters.Qt.filterAttributes = qtsql 5.0.0
-qhp.Qt.subprojects         = classes overviews examples
-qhp.Qt.subprojects.classes.title = Classes
-qhp.Qt.subprojects.classes.indexTitle = Qt SQL's Classes
-qhp.Qt.subprojects.classes.selectors = class fake:headerfile
-qhp.Qt.subprojects.classes.sortPages = true
-qhp.Qt.subprojects.overviews.title = Overviews
-qhp.Qt.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.Qt.subprojects.overviews.selectors = fake:page,group,module
-qhp.Qt.subprojects.examples.title = Qt Core Tutorials and Examples
-qhp.Qt.subprojects.examples.indexTitle = Qt Core Examples
-qhp.Qt.subprojects.examples.selectors = fake:example
+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.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.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
 
 dita.metadata.default.author      = Qt Project
 dita.metadata.default.permissions = all

diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf
index 326d1ca..86dd4f9 100644 (file)
--- a/src/xml/doc/qtxml.qdocconf
+++ b/src/xml/doc/qtxml.qdocconf
@@ -10,26 +10,26 @@ outputencoding          = UTF-8
 naturallanguage         = en_US
 qhp.projects            = QtXml
 
-qhp.QtCore.file            = qtxml.qhp
-qhp.Qt.namespace           = org.qt-project.qtxml.500
-qhp.Qt.virtualFolder       = qdoc
-qhp.Qt.indexTitle          = Qt XML Reference Documentation
-qhp.Qt.indexRoot           =
-
-qhp.Qt.filterAttributes    = qtxml 5.0.0 qtrefdoc
-qhp.Qt.customFilters.Qt.name = QtXml 5.0.0
-qhp.Qt.customFilters.Qt.filterAttributes = qtxml 5.0.0
-qhp.Qt.subprojects         = classes overviews examples
-qhp.Qt.subprojects.classes.title = Classes
-qhp.Qt.subprojects.classes.indexTitle = Qt XML's Classes
-qhp.Qt.subprojects.classes.selectors = class fake:headerfile
-qhp.Qt.subprojects.classes.sortPages = true
-qhp.Qt.subprojects.overviews.title = Overviews
-qhp.Qt.subprojects.overviews.indexTitle = All Overviews and HOWTOs
-qhp.Qt.subprojects.overviews.selectors = fake:page,group,module
-qhp.Qt.subprojects.examples.title = Qt Core Tutorials and Examples
-qhp.Qt.subprojects.examples.indexTitle = Qt Core Examples
-qhp.Qt.subprojects.examples.selectors = fake:example
+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.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.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
 
 dita.metadata.default.author      = Qt Project
 dita.metadata.default.permissions = all