summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/codeparser.cpp
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2012-05-04 15:51:20 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-04 17:57:46 +0200
commit62467e2dd812daf46c76cdab5e443e72f338e6ec (patch)
tree2d35142ab4344f4fea8d4ff48c85b3d8b55a36f9 /src/tools/qdoc/codeparser.cpp
parent7be0e21543dd6bfac9f6d0725ce1eb3559d0d9d8 (diff)
qdoc: Fixed minor version number in DITA XML
The DITA XML didn't contain the correct QML Module version mumber in the imports statement. Change-Id: I22b75facc1396c5adea88be49c86fff11f19f27b Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'src/tools/qdoc/codeparser.cpp')
-rw-r--r--src/tools/qdoc/codeparser.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/qdoc/codeparser.cpp b/src/tools/qdoc/codeparser.cpp
index 5173a404f2..f06cc1f040 100644
--- a/src/tools/qdoc/codeparser.cpp
+++ b/src/tools/qdoc/codeparser.cpp
@@ -250,11 +250,12 @@ void CodeParser::processCommonMetaCommand(const Location& location,
node->setModuleName(arg);
}
else if (command == COMMAND_INQMLMODULE) {
- node->setQmlModuleName(arg);
- tree->addToQmlModule(node,arg);
+ node->setQmlModule(arg);
+ FakeNode* fn = FakeNode::lookupQmlModuleNode(tree, arg);
+ fn->addQmlModuleMember(node);
QString qmid = node->qmlModuleIdentifier();
QmlClassNode* qcn = static_cast<QmlClassNode*>(node);
- QmlClassNode::moduleMap.insert(qmid + QLatin1String("::") + node->name(), qcn);
+ QmlClassNode::insertQmlModuleMember(qmid, qcn);
}
else if (command == COMMAND_MAINCLASS) {
node->setStatus(Node::Main);