summaryrefslogtreecommitdiffstats
path: root/src/tools/qdoc/tokenizer.h
diff options
context:
space:
mode:
authorMartin Smith <[email protected]>2015-06-30 12:40:44 +0200
committerMartin Smith <[email protected]>2015-07-07 12:59:00 +0000
commit68dec6461ec700e871f28c8672be1f28740910e5 (patch)
tree4a81c459b23b41ba2e6115a6e0804b0b5e1142d4 /src/tools/qdoc/tokenizer.h
parent6384c4e94041e588d1defbfd3b4dbbe2f611715c (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 <[email protected]>
Diffstat (limited to 'src/tools/qdoc/tokenizer.h')
-rw-r--r--src/tools/qdoc/tokenizer.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/qdoc/tokenizer.h b/src/tools/qdoc/tokenizer.h
index 2b79320567d..41a3ffd9313 100644
--- a/src/tools/qdoc/tokenizer.h
+++ b/src/tools/qdoc/tokenizer.h
@@ -107,6 +107,7 @@ public:
int braceDepth() const { return yyBraceDepth; }
int parenDepth() const { return yyParenDepth; }
int bracketDepth() const { return yyBracketDepth; }
+ Location& tokenLocation() { return yyTokLoc; }
static void initialize(const Config &config);
static void terminate();