summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@theqtcompany.com>2015-07-23 08:46:16 +0200
committerLars Knoll <lars.knoll@theqtcompany.com>2015-07-24 08:51:25 +0000
commit1945441986043e4d045debec68a0ebdd8fb591b9 (patch)
treeed81539c7bd0372d43f730513d34b70a82c1dfaa /src
parentdbf4c6290f90f81ecda6f5f956f9f859222496ac (diff)
Don't generate invalid XML
An attribute is not allowed twice in XML. So change the associated-property attribute, so that it contains a list of associated properties is required instead of listing them a couple of times. Change-Id: Ibfb21c1a1de5ed39cda2eb29ac318bdbbf0eab4e Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/tools/qdoc/qdocindexfiles.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tools/qdoc/qdocindexfiles.cpp b/src/tools/qdoc/qdocindexfiles.cpp
index 74b0b14347..c7ff8c8288 100644
--- a/src/tools/qdoc/qdocindexfiles.cpp
+++ b/src/tools/qdoc/qdocindexfiles.cpp
@@ -1190,9 +1190,13 @@ bool QDocIndexFiles::generateIndexSection(QXmlStreamWriter& writer,
writer.writeAttribute("relates", functionNode->relates()->name());
}
if (functionNode->hasAssociatedProperties()) {
+ QString associatedProperties;
foreach (PropertyNode* pn, functionNode->associatedProperties()) {
- writer.writeAttribute("associated-property", pn->name());
+ if (!associatedProperties.isEmpty())
+ associatedProperties += QLatin1String(", ");
+ associatedProperties += pn->name();
}
+ writer.writeAttribute("associated-property", associatedProperties);
}
writer.writeAttribute("type", functionNode->returnType());
if (!brief.isEmpty())