summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@digia.com>2013-06-13 10:47:41 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-24 11:45:26 +0200
commit78fe2b145eb53019783aa3c6408852ad4d25c130 (patch)
tree1191f4ce5b48134e78f5af769e2ac8dbd1be59cf /src
parent55b933e6fbf93ed721ef6b7ecb6dce9c06f62834 (diff)
qdoc: Allow colon characters in manifest meta attribute values
The current implementation does not allow colons in attribute values, as it's already used as a separator in the form of 'name:value'. This change allows colons in the value string - one use case is to have URL attributes, as in 'imageUrl:qthelp://path.to.image'. Change-Id: I05c5cb32ffc79a39fbe5e4102f7a4b5bdcc2be53 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/tools/qdoc/htmlgenerator.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 845ed35b3c..73788edb4a 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -4182,11 +4182,12 @@ void HtmlGenerator::generateManifestFile(QString manifest, QString element)
if (match) {
tags += manifestMetaContent[idx].tags;
foreach (const QString &attr, manifestMetaContent[idx].attributes) {
- QStringList attrList = attr.split(QLatin1Char(':'), QString::SkipEmptyParts);
+ QLatin1Char div(':');
+ QStringList attrList = attr.split(div);
if (attrList.count() == 1)
attrList.append(QStringLiteral("true"));
- if (attrList.count() == 2)
- writer.writeAttribute(attrList[0], attrList[1]);
+ QString attrName = attrList.takeFirst();
+ writer.writeAttribute(attrName, attrList.join(div));
}
}
}