diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-06-28 12:04:37 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-06-28 12:04:37 (GMT) |
| commit | 8e7d0d408fc51702cd0f39a1b54b79b1108158dc (patch) | |
| tree | 5dc81eaf870cff83c7a3a7497d18bf8812597e3b /tools/qdoc3/cppcodeparser.cpp | |
| parent | 3aa8ae52ebb7a3395328f52fe2cbae0a44ae7198 (diff) | |
| parent | 94e7b873ed5c04d4850a9e36970906113f12cd55 (diff) | |
| download | Qt-8e7d0d408fc51702cd0f39a1b54b79b1108158dc.zip Qt-8e7d0d408fc51702cd0f39a1b54b79b1108158dc.tar.gz Qt-8e7d0d408fc51702cd0f39a1b54b79b1108158dc.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools/qdoc3/cppcodeparser.cpp')
| -rw-r--r-- | tools/qdoc3/cppcodeparser.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index ce7eba3..e4870e3 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -728,7 +728,10 @@ Node *CppCodeParser::processTopicCommand(const Doc& doc, if (n) classNode = static_cast<const ClassNode*>(n); } - return new QmlClassNode(tre->root(), names[0], classNode); + if (names[0].startsWith("Q")) + return new QmlClassNode(tre->root(), QLatin1String("QML:")+names[0], classNode); + else + return new QmlClassNode(tre->root(), names[0], classNode); } else if (command == COMMAND_QMLBASICTYPE) { #if 0 @@ -752,6 +755,8 @@ Node *CppCodeParser::processTopicCommand(const Doc& doc, QString type; QmlClassNode* qmlClass = 0; if (splitQmlMethodArg(doc,arg,type,element)) { + if (element.startsWith(QLatin1String("Q"))) + element = QLatin1String("QML:") + element; Node* n = tre->findNode(QStringList(element),Node::Fake); if (n && n->subType() == Node::QmlClass) { qmlClass = static_cast<QmlClassNode*>(n); |