diff options
author | David Boddie <dboddie@trolltech.com> | 2010-06-28 13:10:40 +0200 |
---|---|---|
committer | David Boddie <dboddie@trolltech.com> | 2010-06-28 13:10:40 +0200 |
commit | 8f3cbe7e844ee49b1e25544d9b90218b00efa548 (patch) | |
tree | 73e501612ef8efdbfce8afbc5d8c6abe109190d3 /tools/qdoc3/cppcodeparser.cpp | |
parent | 00cb03e2dfbcaca69da980dc79d5b062d4b09028 (diff) | |
parent | 5b90f7c27e7e4a95c75421fa42345b3268707794 (diff) | |
download | qt4-tools-8f3cbe7e844ee49b1e25544d9b90218b00efa548.tar.gz |
Merge branch '4.7' of 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 | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index caee30bba4..e4870e3f6d 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -1855,16 +1855,40 @@ bool CppCodeParser::matchProperty(InnerNode *parent) else if (key == "WRITE") { tre->addPropertyFunction(property, value, PropertyNode::Setter); property->setWritable(true); - } else if (key == "STORED") + } + else if (key == "STORED") property->setStored(value.toLower() == "true"); - else if (key == "DESIGNABLE") - property->setDesignable(value.toLower() == "true"); + else if (key == "DESIGNABLE") { + QString v = value.toLower(); + if (v == "true") + property->setDesignable(true); + else if (v == "false") + property->setDesignable(false); + else { + property->setDesignable(false); + property->setRuntimeDesFunc(value); + } + } else if (key == "RESET") tre->addPropertyFunction(property, value, PropertyNode::Resetter); else if (key == "NOTIFY") { tre->addPropertyFunction(property, value, PropertyNode::Notifier); } - + else if (key == "SCRIPTABLE") { + QString v = value.toLower(); + if (v == "true") + property->setScriptable(true); + else if (v == "false") + property->setScriptable(false); + else { + property->setScriptable(false); + property->setRuntimeScrFunc(value); + } + } + else if (key == "COSTANT") + property->setConstant(); + else if (key == "FINAL") + property->setFinal(); } match(Tok_RightParen); return true; |