diff options
| author | Martin Smith <martin.smith@digia.com> | 2015-06-30 12:40:44 +0200 |
|---|---|---|
| committer | Martin Smith <martin.smith@digia.com> | 2015-07-07 12:59:00 +0000 |
| commit | 68dec6461ec700e871f28c8672be1f28740910e5 (patch) | |
| tree | 4a81c459b23b41ba2e6115a6e0804b0b5e1142d4 /src/tools/qdoc/tokenizer.cpp | |
| parent | 6384c4e94041e588d1defbfd3b4dbbe2f611715c (diff) | |
qdoc: Parsing of inline friends
Some functions in qstring.h are marked with both friend and inline,
and qdoc ignores them when it sees the friend keyword. Then, when qdoc
finds the documentation for the functions in the cpp file, it reports
an error that it can't associate the documentation with anything it
saw in a .h file.
This update corrects that problem. It also improves qdoc's parsing of
other inline functions in other files.
Change-Id: If94e403809af3ee3238eac0f2861b027197d6d3c
Task-number: QTBUG-46531
Reviewed-by: Martin Smith <martin.smith@digia.com>
Diffstat (limited to 'src/tools/qdoc/tokenizer.cpp')
| -rw-r--r-- | src/tools/qdoc/tokenizer.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/qdoc/tokenizer.cpp b/src/tools/qdoc/tokenizer.cpp index 68c6fb7831..a85c3b00d8 100644 --- a/src/tools/qdoc/tokenizer.cpp +++ b/src/tools/qdoc/tokenizer.cpp @@ -186,7 +186,7 @@ int Tokenizer::getToken() } else if (strcmp(yyLex, kwords[i - 1]) == 0) { int ret = (int) Tok_FirstKeyword + i - 1; - if (ret != Tok_explicit && ret != Tok_inline && ret != Tok_typename) + if (ret != Tok_typename) return ret; break; } |