Changeset 846 for trunk/tools/qdoc3/test/qt-cpp-ignore.qdocconf

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdoc3/test/qt-cpp-ignore.qdocconf (modified) (3 diffs)

trunk/tools/qdoc3/test/qt-cpp-ignore.qdocconf

@@ -65 +65 @@
                           Q_XMLPATTERNS_EXPORT \
                           QDBUS_EXPORT \
+                          Q_DBUS_EXPORT \
                           QT_BEGIN_NAMESPACE \
                           QT_BEGIN_INCLUDE_NAMESPACE \
@@ -71 +72 @@
                           PHONON_EXPORT \
                           Q_DECLARATIVE_EXPORT \
-                          Q_GADGET \
-                          QWEBKIT_EXPORT
+                                      Q_GADGET \
+                                  QWEBKIT_EXPORT \
+                          Q_INVOKABLE
 Cpp.ignoredirectives    = Q_DECLARE_HANDLE \
                           Q_DECLARE_INTERFACE \
@@ -91 +93 @@
                           K_DECLARE_PRIVATE \
                           PHONON_OBJECT \
-                          PHONON_HEIR
+                          PHONON_HEIR \
+                          Q_PRIVATE_PROPERTY \
+                          Q_DECLARE_PRIVATE_D \
+                          Q_CLASSINFO