summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/htmlgenerator.cpp
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2013-07-12 14:03:21 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-07-12 14:03:21 +0200
commit1866c13b7dd48aa0c6ede1cf7907a2640e9399f8 (patch)
tree0b61c2d801525228f4c5795795d1cdeb57b3edfa /src/tools/qdoc/htmlgenerator.cpp
parent5b648d4d79d07a7c851ce6211ffff8375d41bfa2 (diff)
parent3ef6cf060e984bca43956a23b61b32ec7347cfc7 (diff)
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/tools/qdoc/htmlgenerator.cpp')
-rw-r--r--src/tools/qdoc/htmlgenerator.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/htmlgenerator.cpp b/src/tools/qdoc/htmlgenerator.cpp
index 387ce066bb..7c861ff885 100644
--- a/src/tools/qdoc/htmlgenerator.cpp
+++ b/src/tools/qdoc/htmlgenerator.cpp
@@ -493,7 +493,7 @@ int HtmlGenerator::generateAtom(const Atom *atom, const Node *relative, CodeMark
else if (atom->string() == "classes") {
generateCompactList(Generic, relative, qdb_->getCppClasses(), true);
}
- else if (atom->string() == "qmlclasses") {
+ else if (atom->string() == "qmltypes") {
generateCompactList(Generic, relative, qdb_->getQmlTypes(), true);
}
else if (atom->string().contains("classesbymodule")) {