diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-06-22 14:56:46 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-29 14:20:59 +0000 |
| commit | d95662896cb41b9f683c1b7b5e690ad080368829 (patch) | |
| tree | 51fada6b827eeefadf51ac06c5357732ff7608ca | |
| parent | 388954d9f90f6300bcc81b5c6987ce047ea38ac1 (diff) | |
Fix 0 for nullptr in documentation
Change-Id: Ie533a5b10fa42a528fae0c4fbe6a4a8294cffe19
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
(cherry picked from commit 15882550bcbbb76724d536b7c30551f8fac0d72a)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/qdoc/aggregate.cpp | 2 | ||||
| -rw-r--r-- | src/qdoc/qdocdatabase.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qdoc/aggregate.cpp b/src/qdoc/aggregate.cpp index 83d882f81..64ac0223e 100644 --- a/src/qdoc/aggregate.cpp +++ b/src/qdoc/aggregate.cpp @@ -88,7 +88,7 @@ Aggregate::~Aggregate() If \a genus is \c{Node::DontCare}, find the first node in this node's child list that has the given \a name. If this node is a QML type, be sure to also look in the children - of its property group nodes. Return the matching node or 0. + of its property group nodes. Return the matching node or \c nullptr. If \a genus is either \c{Node::CPP} or \c {Node::QML}, then find all this node's children that have the given \a name, diff --git a/src/qdoc/qdocdatabase.cpp b/src/qdoc/qdocdatabase.cpp index 68a8a98eb..305003f82 100644 --- a/src/qdoc/qdocdatabase.cpp +++ b/src/qdoc/qdocdatabase.cpp @@ -1325,7 +1325,7 @@ void QDocDatabase::generateIndex(const QString &fileName, const QString &url, co open namespaces (might not be any open ones). If the node is found in an open namespace, prefix \a path with the name of the open namespace and "::" and return a pointer to the - node. Othewrwise return 0. + node. Otherwise return \c nullptr. This function only searches in the current primary tree. */ |