diff options
| author | Martin Smith <martin.smith@qt.io> | 2019-04-05 10:10:25 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2019-04-05 08:39:21 +0000 |
| commit | 745bd6375a2e3351fb88e4afaad8cbb490859458 (patch) | |
| tree | 0c8787f988dfcc551988e9dd53b8d1f90e340097 /src/qdoc/doc.cpp | |
| parent | c7a953c6b4889d1a51ec10c7b90903eece5b01a7 (diff) | |
| download | qttools-745bd6375a2e3351fb88e4afaad8cbb490859458.tar.gz | |
qdoc: Don't report override error when reimp is used
qdoc was reporting an error when the reimplementation of a virtual function
that was documented in the base class was given a qdoc comment in the derived
class that only contained the \reimp command. When the reimp command is used,
the error should not be reported. This change implements that.
Change-Id: I6905e35b4e9c3df12617446c04eb9ea6d1804832
Reviewed-by: Paul Wicking <paul.wicking@qt.io>
Diffstat (limited to 'src/qdoc/doc.cpp')
| -rw-r--r-- | src/qdoc/doc.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/qdoc/doc.cpp b/src/qdoc/doc.cpp index e460b2865..b31125597 100644 --- a/src/qdoc/doc.cpp +++ b/src/qdoc/doc.cpp @@ -3087,6 +3087,15 @@ bool Doc::isInternal() const } /*! + Returns true if the set of metacommands used in the doc + comment contains \e {reimp}. + */ +bool Doc::isMarkedReimp() const +{ + return metaCommandsUsed().contains(QLatin1String("reimp")); +} + +/*! Returns a reference to the list of topic commands used in the current qdoc comment. Normally there is only one, but there can be multiple \e{qmlproperty} commands, for example. |