diff options
author | Martin Smith <martin.smith@digia.com> | 2015-02-26 10:34:47 +0100 |
---|---|---|
committer | Martin Smith <martin.smith@digia.com> | 2015-02-26 13:24:13 +0000 |
commit | 99120ca3cf2a22f89fd7ec46ff483882fc3a2bbe (patch) | |
tree | b3f91f86565049a4de6490481cb41edef0d55864 /src/tools/qdoc/tree.h | |
parent | cd46d94906ec0d10acd0fcb086d9177a1b282691 (diff) |
qdoc: Correct parsing of the using clause
qdoc could only parse the using clause where the 'using'
keyword was followed by 'namespace'. Now it can parse
using clauses with or without 'namespace'.
Change-Id: Ic4aad025c00b3bda2bc1cbd52d0ba8dbbad653e5
Task-number: QTBUG-44553
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'src/tools/qdoc/tree.h')
-rw-r--r-- | src/tools/qdoc/tree.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/qdoc/tree.h b/src/tools/qdoc/tree.h index 2e6f766770..67063ef86a 100644 --- a/src/tools/qdoc/tree.h +++ b/src/tools/qdoc/tree.h @@ -153,6 +153,7 @@ class Tree void resolveInheritanceHelper(int pass, ClassNode* cn); void resolveProperties(); void resolveCppToQmlLinks(); + void resolveUsingClauses(); void fixInheritance(NamespaceNode *rootNode = 0); NamespaceNode *root() { return &root_; } |