diff options
| author | acox <andrew.cox@nokia.com> | 2012-03-12 20:58:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-15 14:12:54 +0100 |
| commit | 8e953bbe6d90bbc73515f2381a780f8112b27bb7 (patch) | |
| tree | cfa1c8e93942950caf8632bd8970dea926a38f07 /doc | |
| parent | 0fe7ed2778b5acde3c609868b0f93c84b747fe6a (diff) | |
Taken from 261 documentation errors down to 246
-Still 16098 in gerrit is needed and this does not affect it.
-#ifndef Q_QDOC needed around all macros where enums follow
to make qdoc recognise them.
-A number of \variables replaces with methods needed updating.
Change-Id: Ia49ddcceb00889182c5fc3a840d0c8a1af4450d9
Reviewed-by: Simo Kivimäki <simo.kivimaki@nokia.com>
Diffstat (limited to 'doc')
| -rwxr-xr-x | doc/compat.qdocconf | 1 | ||||
| -rw-r--r-- | doc/qtpim-cpp-ignore.qdocconf | 3 | ||||
| -rw-r--r-- | doc/src/contactsactions.qdoc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/compat.qdocconf b/doc/compat.qdocconf index 36353aa57..11965b80a 100755 --- a/doc/compat.qdocconf +++ b/doc/compat.qdocconf @@ -1,4 +1,3 @@ -alias.i = e alias.include = input macro.0 = "\\\\0" diff --git a/doc/qtpim-cpp-ignore.qdocconf b/doc/qtpim-cpp-ignore.qdocconf index e8a1002f0..9214bd34e 100644 --- a/doc/qtpim-cpp-ignore.qdocconf +++ b/doc/qtpim-cpp-ignore.qdocconf @@ -12,4 +12,5 @@ Cpp.ignoretokens += \ QTVERSITORGANIZER_BEGIN_NAMESPACE \ QTVERSITORGANIZER_END_NAMESPACE \ Q_DECLARE_CUSTOM_CONTACT_DETAIL \ - Q_DECLARE_CUSTOM_ORGANIZER_DETAIL + Q_DECLARE_CUSTOM_ORGANIZER_DETAIL \ + QTVERSIT_PREPEND_NAMESPACE diff --git a/doc/src/contactsactions.qdoc b/doc/src/contactsactions.qdoc index 9c520a092..c5810eb9d 100644 --- a/doc/src/contactsactions.qdoc +++ b/doc/src/contactsactions.qdoc @@ -113,11 +113,11 @@ derived classes. The QServicePluginInterface-derived class merely instantiates QContactActionFactory-derived class on request for the Qt Service Framework. The QContactActionFactory-derived class then instantiates the actions when required. -\snippet ../../tests/auto/qcontactactions/multiaction/multiaction_p.h Example Contact Action Plugin Declaration +\snippet ../../tests/auto/contacts/qcontactactions/multiaction/multiaction_p.h Example Contact Action Plugin Declaration The implementation of these classes might be something like the following (example only): -\snippet ../../tests/auto/qcontactactions/multiaction/multiaction.cpp Example Contact Action Plugin Implementation +\snippet ../../tests/auto/contacts/qcontactactions/multiaction/multiaction.cpp Example Contact Action Plugin Implementation Once implemented, the plugin must be described by an xml file as per the Qt Service Framework guidelines, and installed in an appropriate location (once again, please see the documentation for the Qt Service Framework). |