diff options
author | Martin Smith <martin.smith@qt.io> | 2018-10-19 17:03:01 +0200 |
---|---|---|
committer | Martin Smith <martin.smith@qt.io> | 2018-12-03 08:55:57 +0000 |
commit | 7fea26a411ea3105ce2e27a360be29e2f356ac0a (patch) | |
tree | d2203b5c77790c6e057785391fe8063182252377 /src/qdoc/cppcodeparser.h | |
parent | 3daa8c3ceef4ee171414c549d8acf3d1bbfc20af (diff) | |
download | qttools-7fea26a411ea3105ce2e27a360be29e2f356ac0a.tar.gz |
qdoc: Do not print error for future functions
Some function declarations are marked as not existing until Qt 6.0
in both the .h and .cpp files, but they are documented in the .cpp
file. qdoc can't tie the documentation for these functions to their
declarations because of the way clang is used, and qdoc reports
that reports the documentation as an error.
This update let's qdoc ignore these functions and not print the error
when they are marked with \since 6.0. This will also work with other
future versions.
This update also collects all the uses of #define COMMAND_xxx in one
location, which was partially required by the \since 6.0 change.
Change-Id: I55052359f387406da340c748768f8e76c0b39d53
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Reviewed-by: Topi Reiniƶ <topi.reinio@qt.io>
Diffstat (limited to 'src/qdoc/cppcodeparser.h')
-rw-r--r-- | src/qdoc/cppcodeparser.h | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/src/qdoc/cppcodeparser.h b/src/qdoc/cppcodeparser.h index 6a1b1dd44..1db389489 100644 --- a/src/qdoc/cppcodeparser.h +++ b/src/qdoc/cppcodeparser.h @@ -143,75 +143,6 @@ protected: QString exampleImageFilter; }; -#define COMMAND_ABSTRACT Doc::alias("abstract") -#define COMMAND_CLASS Doc::alias("class") -#define COMMAND_CONTENTSPAGE Doc::alias("contentspage") -#define COMMAND_DITAMAP Doc::alias("ditamap") -#define COMMAND_ENUM Doc::alias("enum") -#define COMMAND_EXAMPLE Doc::alias("example") -#define COMMAND_EXTERNALPAGE Doc::alias("externalpage") -#define COMMAND_FN Doc::alias("fn") -#define COMMAND_GROUP Doc::alias("group") -#define COMMAND_HEADERFILE Doc::alias("headerfile") -#define COMMAND_INDEXPAGE Doc::alias("indexpage") -#define COMMAND_INHEADERFILE Doc::alias("inheaderfile") -#define COMMAND_MACRO Doc::alias("macro") -#define COMMAND_MODULE Doc::alias("module") -#define COMMAND_NAMESPACE Doc::alias("namespace") -#define COMMAND_OVERLOAD Doc::alias("overload") -#define COMMAND_NEXTPAGE Doc::alias("nextpage") -#define COMMAND_PAGE Doc::alias("page") -#define COMMAND_PREVIOUSPAGE Doc::alias("previouspage") -#define COMMAND_PROPERTY Doc::alias("property") -#define COMMAND_REIMP Doc::alias("reimp") -#define COMMAND_RELATES Doc::alias("relates") -#define COMMAND_STARTPAGE Doc::alias("startpage") -#define COMMAND_TYPEALIAS Doc::alias("typealias") -#define COMMAND_TYPEDEF Doc::alias("typedef") -#define COMMAND_VARIABLE Doc::alias("variable") -#define COMMAND_QMLABSTRACT Doc::alias("qmlabstract") -#define COMMAND_QMLTYPE Doc::alias("qmltype") -#define COMMAND_QMLPROPERTY Doc::alias("qmlproperty") -#define COMMAND_QMLPROPERTYGROUP Doc::alias("qmlpropertygroup") -#define COMMAND_QMLATTACHEDPROPERTY Doc::alias("qmlattachedproperty") -#define COMMAND_QMLINHERITS Doc::alias("inherits") -#define COMMAND_QMLINSTANTIATES Doc::alias("instantiates") -#define COMMAND_QMLSIGNAL Doc::alias("qmlsignal") -#define COMMAND_QMLATTACHEDSIGNAL Doc::alias("qmlattachedsignal") -#define COMMAND_QMLMETHOD Doc::alias("qmlmethod") -#define COMMAND_QMLATTACHEDMETHOD Doc::alias("qmlattachedmethod") -#define COMMAND_QMLDEFAULT Doc::alias("default") -#define COMMAND_QMLREADONLY Doc::alias("readonly") -#define COMMAND_QMLBASICTYPE Doc::alias("qmlbasictype") -#define COMMAND_QMLMODULE Doc::alias("qmlmodule") -#define COMMAND_AUDIENCE Doc::alias("audience") -#define COMMAND_CATEGORY Doc::alias("category") -#define COMMAND_PRODNAME Doc::alias("prodname") -#define COMMAND_COMPONENT Doc::alias("component") -#define COMMAND_AUTHOR Doc::alias("author") -#define COMMAND_PUBLISHER Doc::alias("publisher") -#define COMMAND_COPYRYEAR Doc::alias("copyryear") -#define COMMAND_COPYRHOLDER Doc::alias("copyrholder") -#define COMMAND_PERMISSIONS Doc::alias("permissions") -#define COMMAND_LIFECYCLEVERSION Doc::alias("lifecycleversion") -#define COMMAND_LIFECYCLEWSTATUS Doc::alias("lifecyclestatus") -#define COMMAND_LICENSEYEAR Doc::alias("licenseyear") -#define COMMAND_LICENSENAME Doc::alias("licensename") -#define COMMAND_LICENSEDESCRIPTION Doc::alias("licensedescription") -#define COMMAND_RELEASEDATE Doc::alias("releasedate") -#define COMMAND_QTVARIABLE Doc::alias("qtvariable") -// Some of these are not used currenmtly, but they are included now for completeness. -#define COMMAND_JSTYPE Doc::alias("jstype") -#define COMMAND_JSPROPERTY Doc::alias("jsproperty") -#define COMMAND_JSPROPERTYGROUP Doc::alias("jspropertygroup") -#define COMMAND_JSATTACHEDPROPERTY Doc::alias("jsattachedproperty") -#define COMMAND_JSSIGNAL Doc::alias("jssignal") -#define COMMAND_JSATTACHEDSIGNAL Doc::alias("jsattachedsignal") -#define COMMAND_JSMETHOD Doc::alias("jsmethod") -#define COMMAND_JSATTACHEDMETHOD Doc::alias("jsattachedmethod") -#define COMMAND_JSBASICTYPE Doc::alias("jsbasictype") -#define COMMAND_JSMODULE Doc::alias("jsmodule") - QT_END_NAMESPACE #endif |