diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-30 03:01:58 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-30 03:02:05 +0200 |
| commit | 2aa4435526f00d0d4beebc4413b54d7cdac4f9de (patch) | |
| tree | 80a8e24b0b3ea8a4b82fd081419cd6011d609ae7 /src/qdoc/node.cpp | |
| parent | 735e99d0e11c494592e3f878dc9740d6835bc3c7 (diff) | |
| parent | 65228f25a458d0288108a42e4dcd72d439ee7b2a (diff) | |
| download | qttools-2aa4435526f00d0d4beebc4413b54d7cdac4f9de.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.13' into dev"
Diffstat (limited to 'src/qdoc/node.cpp')
| -rw-r--r-- | src/qdoc/node.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/qdoc/node.cpp b/src/qdoc/node.cpp index e141c9c8d..04b220c09 100644 --- a/src/qdoc/node.cpp +++ b/src/qdoc/node.cpp @@ -1495,7 +1495,7 @@ QString Node::physicalModuleName() const /*! If this node has a child that is a QML property or JS property - named \a n, return a pointer to that child. Otherwise return 0. + named \a n, return a pointer to that child. Otherwise, return \nullptr. */ QmlPropertyNode* Aggregate::hasQmlProperty(const QString& n) const { @@ -1842,8 +1842,9 @@ QmlTypeNode* ClassNode::findQmlBaseNode() \a fn is an overriding function in this class or in a class derived from this class. Find the node for the function that \a fn overrides in this class's children or in one of this - class's base classes. Return a pointer to the overridden - function or return 0. + class's base classes. + + \returns a pointer to the overridden function, or \nullptr. This should be revised because clang provides the path to the overridden function. mws 15/12/2018 @@ -1874,8 +1875,9 @@ FunctionNode* ClassNode::findOverriddenFunction(const FunctionNode* fn) \a fn is an overriding function in this class or in a class derived from this class. Find the node for the property that \a fn overrides in this class's children or in one of this - class's base classes. Return a pointer to the overridden - property or return 0. + class's base classes. + + \returns a pointer to the overridden function, or \nullptr. */ PropertyNode* ClassNode::findOverriddenProperty(const FunctionNode* fn) { |