Doc: Consolidated the QDoc variables.

-Modules only need to include qt-module-defaults.qdocconf
-Sorted the variables.
-The variables still need to be confirmed to be important.

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

3 files changed, 70 insertions, 131 deletions

diff --git a/doc/global/qt-cpp-ignore.qdocconf b/doc/global/qt-cpp-ignore.qdocconf
index 1dfb1cccf8..2dc4e07520 100644
--- a/doc/global/qt-cpp-ignore.qdocconf
+++ b/doc/global/qt-cpp-ignore.qdocconf
@@ -1,40 +1,24 @@
-Cpp.ignoretokens        = QAXFACTORY_EXPORT \
-                          QDESIGNER_COMPONENTS_LIBRARY \
-                          QDESIGNER_EXTENSION_LIBRARY \
-                          QDESIGNER_SDK_LIBRARY \
-                          QDESIGNER_SHARED_LIBRARY \
-                          QDESIGNER_UILIB_LIBRARY \
-                          QM_EXPORT_CANVAS \
-                          QM_EXPORT_DNS \
-                          QM_EXPORT_DOM \
-                          QM_EXPORT_FTP \
-                          QM_EXPORT_HTTP \
-                          QM_EXPORT_ICONVIEW \
-                          QM_EXPORT_NETWORK \
-                          QM_EXPORT_OPENGL \
-                          QM_EXPORT_OPENVG \
-                          QM_EXPORT_SQL \
-                          QM_EXPORT_TABLE \
-                          QM_EXPORT_WORKSPACE \
-                          QM_EXPORT_XML \
-                          QT_ASCII_CAST_WARN \
-                          QT_ASCII_CAST_WARN_CONSTRUCTOR \
-                          QT_BEGIN_HEADER \
-                          QT_DESIGNER_STATIC \
-                          QT_END_HEADER \
-                          QT_FASTCALL \
-                          QT_WIDGET_PLUGIN_EXPORT \
+Cpp.ignoretokens        += \
+                          QDBUS_EXPORT \
+                          Q_AUTOTEST_EXPORT \
+                          Q_BLUETOOTH_EXPORT \
                           Q_COMPAT_EXPORT \
                           Q_CORE_EXPORT \
                           Q_CORE_EXPORT_INLINE \
+                          Q_DBUS_EXPORT \
+                          Q_DECL_CONSTEXPR \
+                          Q_DECL_NOEXCEPT \
+                          Q_DECL_NOTHROW \
+                          Q_DECLARATIVE_EXPORT \
                           Q_EXPLICIT \
                           Q_EXPORT \
                           Q_EXPORT_CODECS_CN \
                           Q_EXPORT_CODECS_JP \
                           Q_EXPORT_CODECS_KR \
                           Q_EXPORT_PLUGIN \
+                          Q_EXPORT_PLUGIN2 \
+                          Q_GADGET \
                           Q_GFX_INLINE \
-                          Q_AUTOTEST_EXPORT \
                           Q_GUI_EXPORT \
                           Q_GUI_EXPORT_INLINE \
                           Q_GUI_EXPORT_STYLE_CDE \
@@ -47,57 +31,83 @@ Cpp.ignoretokens        = QAXFACTORY_EXPORT \
                           Q_GUI_EXPORT_STYLE_SGI \
                           Q_GUI_EXPORT_STYLE_WINDOWS \
                           Q_GUI_EXPORT_STYLE_WINDOWSXP \
-                          QHELP_EXPORT \
                           Q_INLINE_TEMPLATE \
                           Q_INTERNAL_WIN_NO_THROW \
+                          Q_INVOKABLE \
                           Q_LOCATION_EXPORT \
                           Q_NETWORK_EXPORT \
+                          Q_NFC_EXPORT \
                           Q_OPENGL_EXPORT \
                           Q_OPENVG_EXPORT \
                           Q_OUTOFLINE_TEMPLATE \
-                          Q_SQL_EXPORT \
-                          Q_SVG_EXPORT \
+                          Q_PRINTSUPPORT_EXPORT \
                           Q_SCRIPT_EXPORT \
                           Q_SCRIPTTOOLS_EXPORT \
+                          Q_SQL_EXPORT \
+                          Q_SVG_EXPORT \
                           Q_TESTLIB_EXPORT \
+                          Q_WIDGETS_EXPORT \
                           Q_XML_EXPORT \
-                          Q_XMLSTREAM_EXPORT \
                           Q_XMLPATTERNS_EXPORT \
+                          Q_XMLSTREAM_EXPORT \
+                          QAXFACTORY_EXPORT \
                           QDBUS_EXPORT \
-                          Q_DBUS_EXPORT \
-                          QT_BEGIN_NAMESPACE \
+                          QDESIGNER_COMPONENTS_LIBRARY \
+                          QDESIGNER_EXTENSION_LIBRARY \
+                          QDESIGNER_SDK_LIBRARY \
+                          QDESIGNER_SHARED_LIBRARY \
+                          QDESIGNER_UILIB_LIBRARY \
+                          QHELP_EXPORT \
+                          QM_EXPORT_CANVAS \
+                          QM_EXPORT_DNS \
+                          QM_EXPORT_DOM \
+                          QM_EXPORT_FTP \
+                          QM_EXPORT_HTTP \
+                          QM_EXPORT_ICONVIEW \
+                          QM_EXPORT_NETWORK \
+                          QM_EXPORT_OPENGL \
+                          QM_EXPORT_OPENVG \
+                          QM_EXPORT_SQL \
+                          QM_EXPORT_TABLE \
+                          QM_EXPORT_WORKSPACE \
+                          QM_EXPORT_XML \
+                          QT_ASCII_CAST_WARN \
+                          QT_ASCII_CAST_WARN_CONSTRUCTOR \
+                          QT_BEGIN_HEADER \
                           QT_BEGIN_INCLUDE_NAMESPACE \
-                          QT_END_NAMESPACE \
+                          QT_BEGIN_NAMESPACE \
+                          QT_BOOTSTRAPPED \
+                          QT_DESIGNER_STATIC \
+                          QT_END_HEADER \
                           QT_END_INCLUDE_NAMESPACE \
-                          Q_DECLARATIVE_EXPORT \
-                          Q_GADGET \
-                          QWEBKIT_EXPORT \
-                          Q_INVOKABLE \
-                          Q_DECL_CONSTEXPR \
-                          Q_BLUETOOTH_EXPORT \
+                          QT_END_NAMESPACE \
+                          QT_FASTCALL \
+                          QT_WIDGET_PLUGIN_EXPORT \
                           QTBLUETOOTH_BEGIN_NAMESPACE \
                           QTBLUETOOTH_END_NAMESAPCE \
-                          Q_NFC_EXPORT \
                           QTNFC_BEGIN_NAMESPACE \
                           QTNFC_END_NAMESPACE \
-                          Q_DECL_NOTHROW
-Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
+                          QWEBKIT_EXPORT
+
+
+Cpp.ignoredirectives    = \
+                          __attribute__ \
+                          K_DECLARE_PRIVATE \
+                          Q_CLASSINFO \
+                          Q_DECLARE_HANDLE \
                           Q_DECLARE_INTERFACE \
                           Q_DECLARE_METATYPE \
                           Q_DECLARE_OPERATORS_FOR_FLAGS \
                           Q_DECLARE_PRIVATE \
+                          Q_DECLARE_PRIVATE_D \
                           Q_DECLARE_PUBLIC \
                           Q_DECLARE_SHARED \
                           Q_DECLARE_TR_FUNCTIONS \
                           Q_DECLARE_TYPEINFO \
                           Q_DISABLE_COPY \
-                          QT_FORWARD_DECLARE_CLASS \
                           Q_DUMMY_COMPARISON_OPERATOR \
                           Q_ENUMS \
                           Q_FLAGS \
                           Q_INTERFACES \
-                          __attribute__ \
-                          K_DECLARE_PRIVATE \
                           Q_PRIVATE_PROPERTY \
-                          Q_DECLARE_PRIVATE_D \
-                          Q_CLASSINFO
+                          QT_FORWARD_DECLARE_CLASS
diff --git a/doc/global/qt-defines.qdocconf b/doc/global/qt-defines.qdocconf
index 23ada44da8..93b65221ad 100644
--- a/doc/global/qt-defines.qdocconf
+++ b/doc/global/qt-defines.qdocconf
@@ -1,4 +1,8 @@
-defines                 = Q_QDOC \
+versionsym              = QT_VERSION_STR
+
+codeindent              = 1
+
+defines                 += Q_QDOC \
                           QT_.*_SUPPORT \
                           QT_.*_LIB \
                           QT_COMPAT \
@@ -8,10 +12,7 @@ defines                 = Q_QDOC \
                           Q_OS_.* \
                           Q_BYTE_ORDER \
                           QT_DEPRECATED \
+                          QT_DEPRECATED_* \
                           Q_NO_USING_KEYWORD \
                           __cplusplus \
                           Q_COMPILER_INITIALIZER_LISTS
-
-versionsym              = QT_VERSION_STR
-
-codeindent              = 1
diff --git a/doc/global/qt-module-defaults.qdocconf b/doc/global/qt-module-defaults.qdocconf
index d5c623f83b..11803e50e5 100644
--- a/doc/global/qt-module-defaults.qdocconf
+++ b/doc/global/qt-module-defaults.qdocconf
@@ -1,80 +1,8 @@
-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_PRINTSUPPORT_EXPORT \
-                          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
+include(macros.qdocconf)
+include(qt-cpp-ignore.qdocconf)
+include(qt-defines.qdocconf)
+include(qt-html-templates-offline.qdocconf)
+include(compat.qdocconf)
 
 dita.metadata.default.author      = Qt Project
 dita.metadata.default.permissions = all
@@ -95,4 +23,4 @@ sources.fileextensions  = "*.c++ *.cc *.cpp *.cxx *.mm *.qml *.qdoc"
 
 versionsym              = QT_VERSION_STR
 
-macro.raisedaster.HTML  = "<sup>*</sup>"
\ No newline at end of file
+macro.raisedaster.HTML  = "<sup>*</sup>"