From 968581724df1089f4833d8e9e8e9da50a31b34ac Mon Sep 17 00:00:00 2001
From: Jerome Pasion <jerome.pasion@digia.com>
Date: Wed, 7 Nov 2012 12:38:47 +0100
Subject: Doc: Integrated ignoretokens and ignoredirectives from Qt Multimedia.

Sorted the entries

Change-Id: I6e1716c899e2f7e5360571ccfbde5aaf798d65af
Reviewed-by: Martin Smith <martin.smith@digia.com>
---
 doc/global/qt-cpp-ignore.qdocconf | 15 +++++++++------
 doc/global/qt-defines.qdocconf    |  3 +--
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'doc/global')

diff --git a/doc/global/qt-cpp-ignore.qdocconf b/doc/global/qt-cpp-ignore.qdocconf
index 2dc4e07520..2fcbf8bf2c 100644
--- a/doc/global/qt-cpp-ignore.qdocconf
+++ b/doc/global/qt-cpp-ignore.qdocconf
@@ -1,5 +1,5 @@
 Cpp.ignoretokens        += \
-                          QDBUS_EXPORT \
+                          PHONON_EXPORT \
                           Q_AUTOTEST_EXPORT \
                           Q_BLUETOOTH_EXPORT \
                           Q_COMPAT_EXPORT \
@@ -35,8 +35,8 @@ Cpp.ignoretokens        += \
                           Q_INTERNAL_WIN_NO_THROW \
                           Q_INVOKABLE \
                           Q_LOCATION_EXPORT \
+                          Q_MULTIMEDIA_EXPORT
                           Q_NETWORK_EXPORT \
-                          Q_NFC_EXPORT \
                           Q_OPENGL_EXPORT \
                           Q_OPENVG_EXPORT \
                           Q_OUTOFLINE_TEMPLATE \
@@ -46,6 +46,7 @@ Cpp.ignoretokens        += \
                           Q_SQL_EXPORT \
                           Q_SVG_EXPORT \
                           Q_TESTLIB_EXPORT \
+                          Q_TYPENAME \
                           Q_WIDGETS_EXPORT \
                           Q_XML_EXPORT \
                           Q_XMLPATTERNS_EXPORT \
@@ -58,6 +59,7 @@ Cpp.ignoretokens        += \
                           QDESIGNER_SHARED_LIBRARY \
                           QDESIGNER_UILIB_LIBRARY \
                           QHELP_EXPORT \
+                          QM_AUTOTEST_EXPORT \
                           QM_EXPORT_CANVAS \
                           QM_EXPORT_DNS \
                           QM_EXPORT_DOM \
@@ -89,12 +91,12 @@ Cpp.ignoretokens        += \
                           QTNFC_END_NAMESPACE \
                           QWEBKIT_EXPORT
 
-
 Cpp.ignoredirectives    = \
                           __attribute__ \
                           K_DECLARE_PRIVATE \
-                          Q_CLASSINFO \
-                          Q_DECLARE_HANDLE \
+                          PHONON_HEIR \
+                          PHONON_OBJECT \
+                          Q_CLASSINFO
                           Q_DECLARE_INTERFACE \
                           Q_DECLARE_METATYPE \
                           Q_DECLARE_OPERATORS_FOR_FLAGS \
@@ -110,4 +112,5 @@ Cpp.ignoredirectives    = \
                           Q_FLAGS \
                           Q_INTERFACES \
                           Q_PRIVATE_PROPERTY \
-                          QT_FORWARD_DECLARE_CLASS
+                          QT_FORWARD_DECLARE_CLASS \
+                          Q_DECLARE_HANDLE \
diff --git a/doc/global/qt-defines.qdocconf b/doc/global/qt-defines.qdocconf
index 93b65221ad..79b13eee92 100644
--- a/doc/global/qt-defines.qdocconf
+++ b/doc/global/qt-defines.qdocconf
@@ -1,13 +1,12 @@
 versionsym              = QT_VERSION_STR
 
-codeindent              = 1
-
 defines                 += Q_QDOC \
                           QT_.*_SUPPORT \
                           QT_.*_LIB \
                           QT_COMPAT \
                           QT_KEYPAD_NAVIGATION \
                           QT_NO_EGL \
+                          QT3_SUPPORT \
                           Q_WS_.* \
                           Q_OS_.* \
                           Q_BYTE_ORDER \
-- 
cgit v1.2.3