diff options
| author | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-08-10 15:07:31 (GMT) |
|---|---|---|
| committer | Thomas Hartmann <Thomas.Hartmann@nokia.com> | 2009-08-10 15:07:31 (GMT) |
| commit | e67cd6560eea4e4b600d5e3586cd823347e101d2 (patch) | |
| tree | 19e7a596b37c2da517b5d2d0dc0de4f7ee8f5b99 /tools/qdoc3/cppcodeparser.cpp | |
| parent | 9a92aee8ff94a1b705e92f895831f9437762da75 (diff) | |
| parent | cbd8a54f8c55e1982430fc929e9d74f977699428 (diff) | |
| download | Qt-e67cd6560eea4e4b600d5e3586cd823347e101d2.zip Qt-e67cd6560eea4e4b600d5e3586cd823347e101d2.tar.gz Qt-e67cd6560eea4e4b600d5e3586cd823347e101d2.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/kernel/qapplication_win.cpp
Diffstat (limited to 'tools/qdoc3/cppcodeparser.cpp')
| -rw-r--r-- | tools/qdoc3/cppcodeparser.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index 562684b..12ec7f3 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -1737,6 +1737,9 @@ bool CppCodeParser::matchProperty(InnerNode *parent) property->setDesignable(value.toLower() == "true"); else if (key == "RESET") tre->addPropertyFunction(property, value, PropertyNode::Resetter); + else if (key == "NOTIFY") { + tre->addPropertyFunction(property, value, PropertyNode::Notifier); + } } match(Tok_RightParen); return true; |