summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2015-06-29 14:18:12 +0200
committerMartin Smith <martin.smith@digia.com>2015-06-30 19:10:47 +0000
commitb4babd64068d21ab3572febf3de90aabe666835e (patch)
tree0e936c82f2f39513db8b02088bca7420471c230d /doc
parentce4cfd0028a8dae599f4071e356603e3e379cf3a (diff)
qdoc: Missing names from ignored tokens list
Q_DECL_CF_RETURNS_RETAINED and Q_DECL_NS_RETURNS_AUTORELEASED are added to qdoc's list of ignored tokens. Without them, qdoc fails to parse a few function declarations. Change-Id: If59066a765882d88881eed7db31b4b52a6e570ea Task-number: QTBUG-46920 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/global/qt-cpp-defines.qdocconf2
1 files changed, 2 insertions, 0 deletions
diff --git a/doc/global/qt-cpp-defines.qdocconf b/doc/global/qt-cpp-defines.qdocconf
index 153898471c..d6fb2720da 100644
--- a/doc/global/qt-cpp-defines.qdocconf
+++ b/doc/global/qt-cpp-defines.qdocconf
@@ -37,6 +37,8 @@ Cpp.ignoretokens += \
Q_DECL_NOTHROW \
Q_DECL_PURE_FUNCTION \
Q_DECL_UNUSED \
+ Q_DECL_CF_RETURNS_RETAINED \
+ Q_DECL_NS_RETURNS_AUTORELEASED \
Q_DECLARATIVE_EXPORT \
Q_EXPLICIT \
Q_EXPORT \