summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2018-04-12 13:37:56 +0200
committerTopi Reiniƶ <topi.reinio@qt.io>2018-04-12 20:59:51 +0000
commit0c017d45c2ca6279cae418fa951ae2d8a9773020 (patch)
tree90872be0844bc7cf71d89e713bae9ec13edc3f91
parent165d2d762a5a8aa8e307bb7b5b16e29ab94a18d2 (diff)
downloadqttools-0c017d45c2ca6279cae418fa951ae2d8a9773020.tar.gz
qdoc: Remove duplicate 'const' from function signatures in .index
When generating a function signature used in index files (and webxml output), omit adding the 'const' attribute for const functions as FunctionNode::signature() has already added it. Task-number: QTBUG-66528 Change-Id: I7074034d74506d25375603f39b4c2763bd732e4f Reviewed-by: Martin Smith <martin.smith@qt.io>
-rw-r--r--src/qdoc/qdocindexfiles.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qdoc/qdocindexfiles.cpp b/src/qdoc/qdocindexfiles.cpp
index 782af4f43..5f646b82c 100644
--- a/src/qdoc/qdocindexfiles.cpp
+++ b/src/qdoc/qdocindexfiles.cpp
@@ -1224,11 +1224,11 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter& writer,
/*
Note: The "signature" attribute is written to the
- index file, but it is not read back in. Is that ok?
+ index file, but it is not read back in by qdoc. However,
+ we need it for the webxml generator.
*/
QString signature = functionNode->signature(false);
- if (functionNode->isConst())
- signature += " const";
+ // 'const' is already part of FunctionNode::signature()
if (functionNode->isFinal())
signature += " final";
if (functionNode->isOverride())