summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-08-11 03:59:15 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-08-11 03:59:15 (GMT)
commitb63d7dc74b30b741c6481fb41d8bb3951a9bd763 (patch)
tree22b22c6e45124e5f9a0a73109debcd6df67716e4 /tools/qdoc3
parente8d3e8e0b93271bb41fcdc264fc10ec59be5aa20 (diff)
parentcc2fe3a5e2a748a8284ee732befc6a25d193f0c0 (diff)
downloadQt-b63d7dc74b30b741c6481fb41d8bb3951a9bd763.zip
Qt-b63d7dc74b30b741c6481fb41d8bb3951a9bd763.tar.gz
Qt-b63d7dc74b30b741c6481fb41d8bb3951a9bd763.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tools/qdoc3')
-rw-r--r--tools/qdoc3/htmlgenerator.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index d23b41e..eb33ce9 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2027,7 +2027,7 @@ void HtmlGenerator::generateIncludes(const InnerNode *inner, CodeMarker *marker)
}
/*!
- Generates a table of contents begining at \a node.
+ Generates a table of contents beginning at \a node.
*/
void HtmlGenerator::generateTableOfContents(const Node *node,
CodeMarker *marker,
@@ -2113,7 +2113,7 @@ void HtmlGenerator::generateTableOfContents(const Node *node,
/*!
Revised for the new doc format.
- Generates a table of contents begining at \a node.
+ Generates a table of contents beginning at \a node.
*/
void HtmlGenerator::generateTableOfContents(const Node *node,
CodeMarker *marker,