From c3523bdde753daefd421e2ce228f0da0b70051ac Mon Sep 17 00:00:00 2001 From: Casper van Donderen Date: Mon, 3 Sep 2012 10:55:21 +0200 Subject: 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 Reviewed-by: Qt Doc Bot Reviewed-by: Lars Knoll --- doc/global/qt-cpp-ignore.qdocconf | 60 ----------------- doc/global/qt-html-templates-offline.qdocconf | 1 - doc/global/qt-module-defaults.qdocconf | 96 +++++++++++++++++++++++++++ src/concurrent/doc/qtconcurrent.qdocconf | 37 +---------- src/corelib/doc/qtcore.qdocconf | 37 +---------- src/dbus/doc/qtdbus.qdocconf | 37 +---------- src/gui/doc/qtgui.qdocconf | 37 +---------- src/network/doc/qtnetwork.qdocconf | 37 +---------- src/opengl/doc/qtopengl.qdocconf | 37 +---------- src/printsupport/doc/qtprintsupport.qdocconf | 37 +---------- src/sql/doc/qtsql.qdocconf | 37 +---------- src/testlib/doc/qttest.qdocconf | 37 +---------- src/widgets/doc/qtwidgets.qdocconf | 37 +---------- src/xml/doc/qtxml.qdocconf | 37 +---------- 14 files changed, 107 insertions(+), 457 deletions(-) delete mode 100644 doc/global/qt-cpp-ignore.qdocconf create mode 100644 doc/global/qt-module-defaults.qdocconf diff --git a/doc/global/qt-cpp-ignore.qdocconf b/doc/global/qt-cpp-ignore.qdocconf deleted file mode 100644 index 057d294819..0000000000 --- a/doc/global/qt-cpp-ignore.qdocconf +++ /dev/null @@ -1,60 +0,0 @@ -Cpp.ignoretokens = \ - QDBUS_EXPORT \ - QT_ASCII_CAST_WARN \ - QT_ASCII_CAST_WARN_CONSTRUCTOR \ - QT_BEGIN_HEADER \ - QT_BEGIN_INCLUDE_NAMESPACE \ - QT_BEGIN_NAMESPACE \ - QT_BOOTSTRAPPED \ - QT_DESIGNER_STATIC \ - QT_END_HEADER \ - QT_END_INCLUDE_NAMESPACE \ - QT_END_NAMESPACE \ - QT_FASTCALL \ - Q_AUTOTEST_EXPORT \ - Q_COMPAT_EXPORT \ - Q_CORE_EXPORT \ - Q_CORE_EXPORT_INLINE \ - Q_DBUS_EXPORT \ - Q_DECL_CONSTEXPR \ - Q_DECL_NOEXCEPT \ - Q_DECL_NOTHROW \ - Q_EXPORT \ - Q_EXPORT_PLUGIN \ - Q_EXPORT_PLUGIN2 \ - Q_GADGET \ - Q_GUI_EXPORT \ - Q_GUI_EXPORT_INLINE \ - Q_INLINE_TEMPLATE \ - Q_INVOKABLE \ - Q_NETWORK_EXPORT \ - Q_OPENGL_EXPORT \ - Q_OPENVG_EXPORT \ - Q_OUTOFLINE_TEMPLATE \ - Q_SQL_EXPORT \ - Q_SVG_EXPORT \ - Q_SCRIPT_EXPORT \ - Q_SCRIPTTOOLS_EXPORT \ - Q_WIDGETS_EXPORT \ - Q_XML_EXPORT \ - Q_XMLPATTERNS_EXPORT - -Cpp.ignoredirectives = \ - __attribute__ \ - QT_FORWARD_DECLARE_CLASS \ - Q_CLASSINFO \ - Q_DECLARE_INTERFACE \ - Q_DECLARE_METATYPE \ - Q_DECLARE_OPERATORS_FOR_FLAGS \ - Q_DECLARE_PRIVATE \ - Q_DECLARE_PUBLIC \ - Q_DECLARE_PRIVATE_D \ - Q_DECLARE_SHARED \ - Q_DECLARE_TR_FUNCTIONS \ - Q_DECLARE_TYPEINFO \ - Q_DISABLE_COPY \ - Q_DUMMY_COMPARISON_OPERATOR \ - Q_ENUMS \ - Q_FLAGS \ - Q_INTERFACES \ - Q_PRIVATE_PROPERTY diff --git a/doc/global/qt-html-templates-offline.qdocconf b/doc/global/qt-html-templates-offline.qdocconf index 08eb291b5f..bba46c17d4 100644 --- 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-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf new file mode 100644 index 0000000000..4b7755be13 --- /dev/null +++ b/doc/global/qt-module-defaults.qdocconf @@ -0,0 +1,96 @@ +codeindent = 1 + +Cpp.ignoretokens = \ + QDBUS_EXPORT \ + QT_ASCII_CAST_WARN \ + QT_ASCII_CAST_WARN_CONSTRUCTOR \ + QT_BEGIN_HEADER \ + QT_BEGIN_INCLUDE_NAMESPACE \ + QT_BEGIN_NAMESPACE \ + QT_BOOTSTRAPPED \ + QT_DESIGNER_STATIC \ + QT_END_HEADER \ + QT_END_INCLUDE_NAMESPACE \ + QT_END_NAMESPACE \ + QT_FASTCALL \ + Q_AUTOTEST_EXPORT \ + Q_COMPAT_EXPORT \ + Q_CORE_EXPORT \ + Q_CORE_EXPORT_INLINE \ + Q_DBUS_EXPORT \ + Q_DECL_CONSTEXPR \ + Q_DECL_NOEXCEPT \ + Q_DECL_NOTHROW \ + Q_EXPORT \ + Q_EXPORT_PLUGIN \ + Q_EXPORT_PLUGIN2 \ + Q_GADGET \ + Q_GUI_EXPORT \ + Q_GUI_EXPORT_INLINE \ + Q_INLINE_TEMPLATE \ + Q_INVOKABLE \ + Q_NETWORK_EXPORT \ + Q_OPENGL_EXPORT \ + Q_OPENVG_EXPORT \ + Q_OUTOFLINE_TEMPLATE \ + Q_SQL_EXPORT \ + Q_SVG_EXPORT \ + Q_SCRIPT_EXPORT \ + Q_SCRIPTTOOLS_EXPORT \ + Q_WIDGETS_EXPORT \ + Q_XML_EXPORT \ + Q_XMLPATTERNS_EXPORT + +Cpp.ignoredirectives = \ + __attribute__ \ + QT_FORWARD_DECLARE_CLASS \ + Q_CLASSINFO \ + Q_DECLARE_INTERFACE \ + Q_DECLARE_METATYPE \ + Q_DECLARE_OPERATORS_FOR_FLAGS \ + Q_DECLARE_PRIVATE \ + Q_DECLARE_PUBLIC \ + Q_DECLARE_PRIVATE_D \ + Q_DECLARE_SHARED \ + Q_DECLARE_TR_FUNCTIONS \ + Q_DECLARE_TYPEINFO \ + Q_DISABLE_COPY \ + Q_DUMMY_COMPARISON_OPERATOR \ + Q_ENUMS \ + 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 2c2b9f9045..68928f28dd 100644 --- 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 8bfc3dfeec..2658411e88 100644 --- 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 7785b06e99..b98adb6226 100644 --- 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 b154a6dfa7..73104e2bbd 100644 --- 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 c39b4e2bd5..3f18a8e7d5 100644 --- 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 6ac0087b23..5442a66337 100644 --- 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 0e473ef57c..e600c798c5 100644 --- 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 03821f5334..1f509f4fc7 100644 --- 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 d8b6646a6b..1682cad184 100644 --- 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 6f22dfb5c5..c0dd442e51 100644 --- 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 093fcddddb..faae046654 100644 --- 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 += .. -- cgit v1.2.3