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/qmlcodeparser.cpp | |
| 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/qmlcodeparser.cpp')
| -rw-r--r-- | src/qdoc/qmlcodeparser.cpp | 46 |
1 files changed, 0 insertions, 46 deletions
diff --git a/src/qdoc/qmlcodeparser.cpp b/src/qdoc/qmlcodeparser.cpp index 31775bb1b..86db59a3f 100644 --- a/src/qdoc/qmlcodeparser.cpp +++ b/src/qdoc/qmlcodeparser.cpp @@ -44,52 +44,6 @@ QT_BEGIN_NAMESPACE -#define COMMAND_STARTPAGE Doc::alias("startpage") -#define COMMAND_VARIABLE Doc::alias("variable") - -#define COMMAND_DEPRECATED Doc::alias("deprecated") -#define COMMAND_INGROUP Doc::alias("ingroup") -#define COMMAND_INTERNAL Doc::alias("internal") -#define COMMAND_OBSOLETE Doc::alias("obsolete") -#define COMMAND_PAGEKEYWORDS Doc::alias("pagekeywords") -#define COMMAND_PRELIMINARY Doc::alias("preliminary") -#define COMMAND_SINCE Doc::alias("since") -#define COMMAND_WRAPPER Doc::alias("wrapper") -#define COMMAND_NOAUTOLIST Doc::alias("noautolist") - -#define COMMAND_ABSTRACT Doc::alias("abstract") -#define COMMAND_QMLABSTRACT Doc::alias("qmlabstract") -#define COMMAND_QMLCLASS Doc::alias("qmlclass") -#define COMMAND_QMLTYPE Doc::alias("qmltype") -#define COMMAND_QMLMODULE Doc::alias("qmlmodule") -#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_INQMLMODULE Doc::alias("inqmlmodule") -#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_JSTYPE Doc::alias("jstype") -#define COMMAND_JSMODULE Doc::alias("jsmodule") -#define COMMAND_JSPROPERTY Doc::alias("jsproperty") -#define COMMAND_JSPROPERTYGROUP Doc::alias("jspropertygroup") -#define COMMAND_JSATTACHEDPROPERTY Doc::alias("jsattachedproperty") -#define COMMAND_INJSMODULE Doc::alias("injsmodule") -#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") - /*! Constructs the QML code parser. */ |