diff options
| author | Martin Smith <martin.smith@nokia.com> | 2012-05-04 15:51:20 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 17:57:46 +0200 |
| commit | 62467e2dd812daf46c76cdab5e443e72f338e6ec (patch) | |
| tree | 2d35142ab4344f4fea8d4ff48c85b3d8b55a36f9 /src/tools/qdoc/qmlvisitor.cpp | |
| parent | 7be0e21543dd6bfac9f6d0725ce1eb3559d0d9d8 (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/qmlvisitor.cpp')
| -rw-r--r-- | src/tools/qdoc/qmlvisitor.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/qdoc/qmlvisitor.cpp b/src/tools/qdoc/qmlvisitor.cpp index 36dc5cc16a..1544227fc3 100644 --- a/src/tools/qdoc/qmlvisitor.cpp +++ b/src/tools/qdoc/qmlvisitor.cpp @@ -311,11 +311,12 @@ void QmlDocVisitor::applyMetacommands(QQmlJS::AST::SourceLocation, node->setStatus(Node::Deprecated); } else if (command == COMMAND_INQMLMODULE) { - node->setQmlModuleName(args[0]); - tree->addToQmlModule(node,args[0]); + node->setQmlModule(args[0]); + FakeNode* fn = FakeNode::lookupQmlModuleNode(tree, args[0]); + fn->addQmlModuleMember(node); QString qmid = node->qmlModuleIdentifier(); QmlClassNode* qcn = static_cast<QmlClassNode*>(node); - QmlClassNode::moduleMap.insert(qmid + "::" + node->name(), qcn); + QmlClassNode::insertQmlModuleMember(qmid, qcn); } else if (command == COMMAND_QMLINHERITS) { if (node->name() == args[0]) |