summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rwxr-xr-xdoc/compat.qdocconf1
-rw-r--r--doc/qtpim-cpp-ignore.qdocconf3
-rw-r--r--doc/src/contactsactions.qdoc4
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).