diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-04-23 01:50:48 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-04-23 01:50:48 (GMT) |
| commit | 28cec90fd8740f1d47010d99699f86ac014e9926 (patch) | |
| tree | d3ff8dd0eec3bf5c6536960650490cb4cc382396 /tools/qdoc3/cppcodeparser.cpp | |
| parent | 0e8b82bc7b9b0d88e8cc4a4d293851795d35950a (diff) | |
| download | Qt-28cec90fd8740f1d47010d99699f86ac014e9926.zip Qt-28cec90fd8740f1d47010d99699f86ac014e9926.tar.gz Qt-28cec90fd8740f1d47010d99699f86ac014e9926.tar.bz2 | |
Merge in changes to old kinetic-dui branch.
Diffstat (limited to 'tools/qdoc3/cppcodeparser.cpp')
| -rw-r--r-- | tools/qdoc3/cppcodeparser.cpp | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index 92d6cf9..e271590 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -90,6 +90,7 @@ QT_BEGIN_NAMESPACE #define COMMAND_QMLINHERITS Doc::alias("inherits") #define COMMAND_QMLSIGNAL Doc::alias("qmlsignal") #define COMMAND_QMLMETHOD Doc::alias("qmlmethod") +#define COMMAND_QMLDEFAULT Doc::alias("default") #endif QStringList CppCodeParser::exampleFiles; @@ -820,7 +821,8 @@ QSet<QString> CppCodeParser::otherMetaCommands() << COMMAND_INDEXPAGE #ifdef QDOC_QML << COMMAND_STARTPAGE - << COMMAND_QMLINHERITS; + << COMMAND_QMLINHERITS + << COMMAND_QMLDEFAULT; #else << COMMAND_STARTPAGE; #endif @@ -890,14 +892,19 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc, else if (command == COMMAND_RELATES) { InnerNode *pseudoParent; if (arg.startsWith("<") || arg.startsWith("\"")) { - pseudoParent = static_cast<InnerNode *>(tre->findNode(QStringList(arg), Node::Fake)); + pseudoParent = + static_cast<InnerNode *>(tre->findNode(QStringList(arg), + Node::Fake)); } else { QStringList newPath = arg.split("::"); - pseudoParent = static_cast<InnerNode *>(tre->findNode(QStringList(newPath), Node::Class)); + pseudoParent = + static_cast<InnerNode*>(tre->findNode(QStringList(newPath), + Node::Class)); if (!pseudoParent) - pseudoParent = static_cast<InnerNode *>(tre->findNode(QStringList(newPath), - Node::Namespace)); + pseudoParent = + static_cast<InnerNode*>(tre->findNode(QStringList(newPath), + Node::Namespace)); } if (!pseudoParent) { doc.location().warning(tr("Cannot find '%1' in '\\%2'") @@ -926,6 +933,10 @@ void CppCodeParser::processOtherMetaCommand(const Doc& doc, else if (command == COMMAND_QMLINHERITS) { setLink(node, Node::InheritsLink, arg); } + else if (command == COMMAND_QMLDEFAULT) { + QmlPropGroupNode* qpgn = static_cast<QmlPropGroupNode*>(node); + qpgn->setDefault(); + } #endif else { processCommonMetaCommand(doc.location(),command,arg,node,tre); |