diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-04-05 11:41:19 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-04-05 11:41:19 (GMT) |
| commit | a01e0d1928aa17690d3e0ebadbac7b95bf0f0e84 (patch) | |
| tree | 8114a1cc23338adb8477d23ebcc6bacaa9434c1d /tools/qdoc3/doc.cpp | |
| parent | c49a91a9629122f01df285a0b436c7502abc769c (diff) | |
| download | Qt-a01e0d1928aa17690d3e0ebadbac7b95bf0f0e84.zip Qt-a01e0d1928aa17690d3e0ebadbac7b95bf0f0e84.tar.gz Qt-a01e0d1928aa17690d3e0ebadbac7b95bf0f0e84.tar.bz2 | |
qdoc: Allowed multiple values for certain metadata tags.
Also output mainters for classes in the HTML output,
if there are maintainers listed.
Diffstat (limited to 'tools/qdoc3/doc.cpp')
| -rw-r--r-- | tools/qdoc3/doc.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp index 66acacf..2239f43 100644 --- a/tools/qdoc3/doc.cpp +++ b/tools/qdoc3/doc.cpp @@ -63,6 +63,7 @@ Q_GLOBAL_STATIC(QSet<QString>, null_Set_QString) Q_GLOBAL_STATIC(QStringList, null_QStringList) Q_GLOBAL_STATIC(QList<Text>, null_QList_Text) Q_GLOBAL_STATIC(QStringMap, null_QStringMap) +Q_GLOBAL_STATIC(QStringMultiMap, null_QStringMultiMap) struct Macro { @@ -228,7 +229,7 @@ class DocPrivateExtra QList<int> tableOfContentsLevels; QList<Atom*> keywords; QList<Atom*> targets; - QStringMap metaMap; + QStringMultiMap metaMap; DocPrivateExtra() : granularity(Doc::Part) { } @@ -2960,9 +2961,9 @@ const QList<Atom *> &Doc::targets() const return priv->extra->targets; } -const QStringMap &Doc::metaTagMap() const +const QStringMultiMap &Doc::metaTagMap() const { - return priv && priv->extra ? priv->extra->metaMap : *null_QStringMap(); + return priv && priv->extra ? priv->extra->metaMap : *null_QStringMultiMap(); } void Doc::initialize(const Config& config) |