diff options
| author | Martin Smith <martin.smith@nokia.com> | 2011-03-24 08:55:07 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2011-03-24 08:55:07 (GMT) |
| commit | 7cdc69ee359b41c7e8986dc588b5acf966df2a81 (patch) | |
| tree | 12150964f75badeda928160d700ce1342a7de559 /tools/qdoc3/cppcodeparser.cpp | |
| parent | 1532f7d5dc0c2aab0ab2b62344b398f7fb11de7e (diff) | |
| parent | 98d65b5967d5f8a1648d73185986fabab97e692b (diff) | |
| download | Qt-7cdc69ee359b41c7e8986dc588b5acf966df2a81.zip Qt-7cdc69ee359b41c7e8986dc588b5acf966df2a81.tar.gz Qt-7cdc69ee359b41c7e8986dc588b5acf966df2a81.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'tools/qdoc3/cppcodeparser.cpp')
| -rw-r--r-- | tools/qdoc3/cppcodeparser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index 8becdd5..4d04085 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -1827,7 +1827,7 @@ bool CppCodeParser::matchProperty(InnerNode *parent) !match(Tok_QDOC_PROPERTY)) { return false; } - + if (!match(expected_tok)) return false; @@ -1909,9 +1909,9 @@ bool CppCodeParser::matchProperty(InnerNode *parent) property->setRuntimeScrFunc(value); } } - else if (key == "CONSTANT") + else if (key == "CONSTANT") property->setConstant(); - else if (key == "FINAL") + else if (key == "FINAL") property->setFinal(); } match(Tok_RightParen); |