From ca81f8e469faba11f622af9a9ec537a7b3cec08f Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Mon, 8 Feb 2016 11:21:16 +0100 Subject: qdoc: Implement support for C++11 scoped enumerations. Task-number: QTBUG-41958 Change-Id: I290dc3f2f3072a1b6884d1484aa9109aa0b99dcc Reviewed-by: Martin Smith --- src/qdoc/cppcodeparser.cpp | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/qdoc/cppcodeparser.cpp') diff --git a/src/qdoc/cppcodeparser.cpp b/src/qdoc/cppcodeparser.cpp index 0405cc2c2..7d9838a79 100644 --- a/src/qdoc/cppcodeparser.cpp +++ b/src/qdoc/cppcodeparser.cpp @@ -1931,8 +1931,15 @@ bool CppCodeParser::matchEnumDecl(Aggregate *parent) if (!match(Tok_enum)) return false; + if (tok == Tok_struct || tok == Tok_class) + readToken(); // ignore C++11 struct or class attribute if (match(Tok_Ident)) name = previousLexeme(); + if (match(Tok_Colon)) { // ignore C++11 enum-base + CodeChunk dataType; + if (!matchDataType(&dataType)) + return false; + } if (tok != Tok_LeftBrace) return false; -- cgit v1.2.1