diff options
| author | Martin Smith <martin.smith@qt.io> | 2019-07-02 15:31:05 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@qt.io> | 2019-07-05 18:40:57 +0200 |
| commit | 6bdf50863e6f291af652930df0e9e0dded83751a (patch) | |
| tree | b4295cad97b28f7c2893f874d068b9c808e2d3bf | |
| parent | 4c393157a17f8d46634574f0add2f7d59ecc9c04 (diff) | |
| download | qttools-6bdf50863e6f291af652930df0e9e0dded83751a.tar.gz | |
qdoc: Correct function signatures from header files
This update fixes a regression where the signatures of global functions
declared in header files were being erroneously qualified with the name
of the header file. The incorrect qualification is removed.
Task-number: QTBUG-76822
Change-Id: I59ddee9cdeb5cad45afab7f0b4a50e90bde1578c
Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| -rw-r--r-- | src/qdoc/cppcodemarker.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/qdoc/cppcodemarker.cpp b/src/qdoc/cppcodemarker.cpp index 2387fb22d..b1c7b1489 100644 --- a/src/qdoc/cppcodemarker.cpp +++ b/src/qdoc/cppcodemarker.cpp @@ -36,6 +36,7 @@ #include <qdebug.h> #include <qregexp.h> #include <ctype.h> +#include "generator.h" QT_BEGIN_NAMESPACE @@ -128,9 +129,11 @@ QString CppCodeMarker::markedUpSynopsis(const Node *node, name = linkTag(node, name); name = "<@name>" + name + "</@name>"; - if ((style == Section::Details) && !node->parent()->name().isEmpty() && - !node->isProperty() && !node->isQmlNode() && !node->isJsNode()) - name.prepend(taggedNode(node->parent()) + "::"); + if (style == Section::Details) { + if (!node->parent()->name().isEmpty() && !node->parent()->isHeader() && + !node->isProperty() && !node->isQmlNode() && !node->isJsNode()) + name.prepend(taggedNode(node->parent()) + "::"); + } switch (node->nodeType()) { case Node::Namespace: |