diff options
| author | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2016-02-11 12:36:23 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@theqtcompany.com> | 2016-02-11 11:59:29 +0000 |
| commit | 05206b44cf25ca6a895cc9a8716f2b7f2f14191f (patch) | |
| tree | ea16ca524e8a87995964dfe6df8980f6de688ccc | |
| parent | 6f4ce6b91e81a26bca8b9811f98a9c2028fbd9bc (diff) | |
| download | qttools-05206b44cf25ca6a895cc9a8716f2b7f2f14191f.tar.gz | |
Make sure we allow final and default in Q_PROPERTY.
Change-Id: I194d9c041d94fc08032003e8a69329902c352e81
Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
| -rw-r--r-- | src/qdoc/cppcodeparser.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index 588417644..28eb08899 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -2024,7 +2024,7 @@ bool CppCodeParser::matchProperty(Aggregate *parent) property->setDataType(dataType.toString()); while (tok != Tok_RightParen && tok != Tok_Eoi) { - if (!match(Tok_Ident)) + if (!match(Tok_Ident) && !match(Tok_default) && !match(Tok_final)) return false; QString key = previousLexeme(); QString value; |