summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/text.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@digia.com>2013-05-07 14:40:36 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-05-08 12:01:29 +0200
commit843b7f1a1705e2f1b207eb4958be87d570ac7a5f (patch)
tree8b99b1efcb8827e0dda7a0d58dc5566fe93eba0d /src/tools/qdoc/text.cpp
parent1d22f20887d370fed21356ae063e5556be210c63 (diff)
qdoc: Briefs from other modules now show up
The brief text for a documented thing is now output as an attribute of that thing in the module's index file, and it is reconstituted in the thing's tree node, when qdoc reads the module's index file later. Only the verbatim text of the brief is saved in the index file, i.e. no links or other markup. The effect is that brief texts can be used in other modules. Task-number: QTBUG-31021 Change-Id: I932a0c85259b6d1901138f0c0959ddb9815b7db5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Diffstat (limited to 'src/tools/qdoc/text.cpp')
-rw-r--r--src/tools/qdoc/text.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/tools/qdoc/text.cpp b/src/tools/qdoc/text.cpp
index 2d218bd469..e2f682726d 100644
--- a/src/tools/qdoc/text.cpp
+++ b/src/tools/qdoc/text.cpp
@@ -149,6 +149,11 @@ void Text::stripLastAtom()
}
}
+/*!
+ This function traverses the atom list of the Text object,
+ extracting all the string parts. It concatenates them to
+ a result string and returns it.
+ */
QString Text::toString() const
{
QString str;