Doc: Centralize more common settings in 1 global qdocconf.

All qdocconf settings that should be used by all Qt modules are now in
qt-module-defaults.qdocconf.

Change-Id: I2a0315a55db3fcbb0160c4392d2da98611043d83
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf
index 08eb291..bba46c1 100644 (file)
--- a/doc/global/qt-html-templates-offline.qdocconf
+++ b/doc/global/qt-html-templates-offline.qdocconf
@@ -1,4 +1,3 @@
-HTML.generatemacrefs    = "true"
 HTML.nobreadcrumbs      = "true"
 
 HTML.stylesheets = global/style/offline.css

diff --git a/doc/global/qt-cpp-ignore.qdocconf b/doc/global/qt-module-defaults.qdocconf
similarity index 67%
rename from doc/global/qt-cpp-ignore.qdocconf
rename to doc/global/qt-module-defaults.qdocconf
index 057d294..4b7755b 100644 (file)
--- a/doc/global/qt-cpp-ignore.qdocconf
+++ b/doc/global/qt-module-defaults.qdocconf
@@ -1,3 +1,5 @@
+codeindent              = 1
+
 Cpp.ignoretokens        = \
                           QDBUS_EXPORT \
                           QT_ASCII_CAST_WARN \
@@ -58,3 +60,37 @@ Cpp.ignoredirectives    = \
                           Q_FLAGS \
                           Q_INTERFACES \
                           Q_PRIVATE_PROPERTY
+
+defines                 = Q_QDOC \
+                          QT_.*_SUPPORT \
+                          QT_.*_LIB \
+                          QT_COMPAT \
+                          QT_KEYPAD_NAVIGATION \
+                          QT_NO_EGL \
+                          Q_OS_.* \
+                          Q_BYTE_ORDER \
+                          QT_DEPRECATED \
+                          QT_DEPRECATED_* \
+                          Q_NO_USING_KEYWORD \
+                          __cplusplus \
+                          Q_COMPILER_INITIALIZER_LISTS
+
+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
+
+naturallanguage         = en_US
+outputencoding          = UTF-8
+sourceencoding          = UTF-8
+
+examples.fileextensions = "*.cpp *.h *.js *.xq *.svg *.xml *.ui *.qhp *.qhcp *.qml *.css"
+examples.imageextensions = "*.png *.jpg *.gif"
+
+headers.fileextensions  = "*.ch *.h *.h++ *.hh *.hpp *.hxx"
+sources.fileextensions  = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
+
+versionsym              = QT_VERSION_STR
+

diff --git a/src/concurrent/doc/qtconcurrent.qdocconf b/src/concurrent/doc/qtconcurrent.qdocconf
index 2c2b9f9..68928f2 100644 (file)
--- a/src/concurrent/doc/qtconcurrent.qdocconf
+++ b/src/concurrent/doc/qtconcurrent.qdocconf
@@ -1,14 +1,11 @@
 include(../../../doc/global/qt-html-templates-offline.qdocconf)
-include(../../../doc/global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
 
 project                 = QtConcurrent
 description             = Qt Concurrent Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qtconcurrent
 version                 = 5.0.0
 
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
 qhp.projects            = QtConcurrent
 
 qhp.QtConcurrent.file         = qtconcurrent.qhp
@@ -32,41 +29,9 @@ qhp.QtConcurrent.subprojects.examples.title = Qt Concurrent Examples
 qhp.QtConcurrent.subprojects.examples.indexTitle = Qt Concurrent Examples
 qhp.QtConcurrent.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/qtconcurrent
 tagfile                 = ../../../doc/qtconcurrent/qtconcurrent.tags
 
-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  += ..

diff --git a/src/corelib/doc/qtcore.qdocconf b/src/corelib/doc/qtcore.qdocconf
index 8bfc3df..2658411 100644 (file)
--- a/src/corelib/doc/qtcore.qdocconf
+++ b/src/corelib/doc/qtcore.qdocconf
@@ -1,14 +1,11 @@
 include(../../../doc/global/qt-html-templates-offline.qdocconf)
-include(../../../doc/global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
 
 project                 = QtCore
 description             = Qt Core Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qtcore
 version                 = 5.0.0
 
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
 qhp.projects            = QtCore
 
 qhp.QtCore.file                = qtcore.qhp
@@ -32,41 +29,9 @@ 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
-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/qtcore
 tagfile                 = ../../../doc/qtcore/qtcore.tags
 
-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
-
 headerdirs  += ..
 
 sourcedirs  += ..

diff --git a/src/dbus/doc/qtdbus.qdocconf b/src/dbus/doc/qtdbus.qdocconf
index 7785b06..b98adb6 100644 (file)
--- a/src/dbus/doc/qtdbus.qdocconf
+++ b/src/dbus/doc/qtdbus.qdocconf
@@ -1,14 +1,11 @@
 include(../../../doc/global/qt-html-templates-offline.qdocconf)
-include(../../../doc/global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
 
 project                 = QtDBus
 description             = Qt DBus Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qtdbus
 version                 = 5.0.0
 
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
 qhp.projects            = QtDBus
 
 qhp.QtDBus.file         = qtdbus.qhp
@@ -32,41 +29,9 @@ qhp.QtDBus.subprojects.examples.title = Qt DBus Examples
 qhp.QtDBus.subprojects.examples.indexTitle = Qt DBus Examples
 qhp.QtDBus.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/qtdbus
 tagfile                 = ../../../doc/qtdbus/qtdbus.tags
 
-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  += ..

diff --git a/src/gui/doc/qtgui.qdocconf b/src/gui/doc/qtgui.qdocconf
index b154a6d..73104e2 100644 (file)
--- a/src/gui/doc/qtgui.qdocconf
+++ b/src/gui/doc/qtgui.qdocconf
@@ -1,14 +1,11 @@
 include(../../../doc/global/qt-html-templates-offline.qdocconf)
-include(../../../doc/global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
 
 project                 = QtGui
 description             = Qt GUI Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qtgui
 version                 = 5.0.0
 
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
 qhp.projects            = QtGui
 
 qhp.QtGui.file         = qtgui.qhp
@@ -32,41 +29,9 @@ qhp.QtGui.subprojects.examples.title = Qt GUI Examples
 qhp.QtGui.subprojects.examples.indexTitle = Qt GUI Examples
 qhp.QtGui.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/qtgui
 tagfile                 = ../../../doc/qtgui/qtgui.tags
 
-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  += ..

diff --git a/src/network/doc/qtnetwork.qdocconf b/src/network/doc/qtnetwork.qdocconf
index c39b4e2..3f18a8e 100644 (file)
--- a/src/network/doc/qtnetwork.qdocconf
+++ b/src/network/doc/qtnetwork.qdocconf
@@ -1,14 +1,11 @@
 include(../../../doc/global/qt-html-templates-offline.qdocconf)
-include(../../../doc/global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
 
 project                 = QtNetwork
 description             = Qt Network Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qtnetwork
 version                 = 5.0.0
 
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
 qhp.projects            = QtNetwork
 
 qhp.QtNetwork.file         = qtnetwork.qhp
@@ -32,41 +29,9 @@ 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
 
-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  += ..

diff --git a/src/opengl/doc/qtopengl.qdocconf b/src/opengl/doc/qtopengl.qdocconf
index 6ac0087..5442a66 100644 (file)
--- a/src/opengl/doc/qtopengl.qdocconf
+++ b/src/opengl/doc/qtopengl.qdocconf
@@ -1,14 +1,11 @@
 include(../../../doc/global/qt-html-templates-offline.qdocconf)
-include(../../../doc/global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
 
 project                 = QtOpenGL
 description             = Qt OpenGL Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qtopengl
 version                 = 5.0.0
 
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
 qhp.projects            = QtOpenGL
 
 qhp.QtOpenGL.file         = qtopengl.qhp
@@ -32,41 +29,9 @@ qhp.QtOpenGL.subprojects.examples.title = Qt OpenGL Examples
 qhp.QtOpenGL.subprojects.examples.indexTitle = Qt OpenGL Examples
 qhp.QtOpenGL.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/qtopengl
 tagfile                 = ../../../doc/qtopengl/qtopengl.tags
 
-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 qtgui qtwidgets
 
 headerdirs  += ..

diff --git a/src/printsupport/doc/qtprintsupport.qdocconf b/src/printsupport/doc/qtprintsupport.qdocconf
index 0e473ef..e600c79 100644 (file)
--- a/src/printsupport/doc/qtprintsupport.qdocconf
+++ b/src/printsupport/doc/qtprintsupport.qdocconf
@@ -1,14 +1,11 @@
 include(../../../doc/global/qt-html-templates-offline.qdocconf)
-include(../../../doc/global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
 
 project                 = QtPrintSupport
 description             = Qt Print Support Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qtprintsupport
 version                 = 5.0.0
 
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
 qhp.projects            = QtPrintSupport
 
 qhp.QtPrintSupport.file         = qtprintsupport.qhp
@@ -32,41 +29,9 @@ 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
 
-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/qtprintsupport
 tagfile                 = ../../../doc/qtprintsupport/qtprintsupport.tags
 
-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 qtgui qtwidgets
 
 headerdirs  += ..

diff --git a/src/sql/doc/qtsql.qdocconf b/src/sql/doc/qtsql.qdocconf
index 03821f5..1f509f4 100644 (file)
--- a/src/sql/doc/qtsql.qdocconf
+++ b/src/sql/doc/qtsql.qdocconf
@@ -1,14 +1,11 @@
 include(../../../doc/global/qt-html-templates-offline.qdocconf)
-include(../../../doc/global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
 
 project                 = QtSql
 description             = Qt SQL 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            = QtSql
 
 qhp.QtSql.file            = qtsql.qhp
@@ -32,41 +29,9 @@ 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
-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/qtsql
 tagfile                 = ../../../doc/qtsql/qtsql.tags
 
-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  += ..

diff --git a/src/testlib/doc/qttest.qdocconf b/src/testlib/doc/qttest.qdocconf
index d8b6646..1682cad 100644 (file)
--- a/src/testlib/doc/qttest.qdocconf
+++ b/src/testlib/doc/qttest.qdocconf
@@ -1,14 +1,11 @@
 include(../../../doc/global/qt-html-templates-offline.qdocconf)
-include(../../../doc/global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
 
 project                 = QtTest
 description             = Qt Test Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qttest
 version                 = 5.0.0
 
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
 qhp.projects            = QtTest
 
 qhp.QtTest.file                = qttest.qhp
@@ -32,41 +29,9 @@ qhp.QtTest.subprojects.examples.title = Qt Test Examples
 qhp.QtTest.subprojects.examples.indexTitle = Qt Test Examples
 qhp.QtTest.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/qttest
 tagfile                 = ../../../doc/qttest/qttest.tags
 
-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  += ..

diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf
index 6f22dfb..c0dd442 100644 (file)
--- a/src/widgets/doc/qtwidgets.qdocconf
+++ b/src/widgets/doc/qtwidgets.qdocconf
@@ -1,14 +1,11 @@
 include(../../../doc/global/qt-html-templates-offline.qdocconf)
-include(../../../doc/global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
 
 project                 = QtWidgets
 description             = Qt Widgets Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qtwidgets
 version                 = 5.0.0
 
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
 qhp.projects            = QtWidgets
 
 qhp.QtWidgets.file         = qtwidgets.qhp
@@ -32,41 +29,9 @@ qhp.QtWidgets.subprojects.examples.title = Qt Widgets Examples
 qhp.QtWidgets.subprojects.examples.indexTitle = Qt Widgets Examples
 qhp.QtWidgets.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/qtwidgets
 tagfile                 = ../../../doc/qtwidgets/qtwidgets.tags
 
-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 qtgui
 
 headerdirs  += ..

diff --git a/src/xml/doc/qtxml.qdocconf b/src/xml/doc/qtxml.qdocconf
index 093fcdd..faae046 100644 (file)
--- a/src/xml/doc/qtxml.qdocconf
+++ b/src/xml/doc/qtxml.qdocconf
@@ -1,14 +1,11 @@
 include(../../../doc/global/qt-html-templates-offline.qdocconf)
-include(../../../doc/global/qt-cpp-ignore.qdocconf)
+include(../../../doc/global/qt-module-defaults.qdocconf)
 
 project                 = QtXml
 description             = Qt XML Reference Documentation
 url                     = http://qt-project.org/doc/qt-5.0/qtxml
 version                 = 5.0.0
 
-sourceencoding          = UTF-8
-outputencoding          = UTF-8
-naturallanguage         = en_US
 qhp.projects            = QtXml
 
 qhp.QtXml.file            = qtxml.qhp
@@ -32,41 +29,9 @@ 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
-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/qtxml
 tagfile                 = ../../../doc/qtxml/qtxml.tags
 
-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  += ..