diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-07-07 07:51:34 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2010-07-16 07:08:15 (GMT) |
| commit | 830317bda972cc121ff8204f43d639c183e754ad (patch) | |
| tree | ec15c0b373fcceffee4f4db502260962df058f28 /tools/qdoc3/cppcodemarker.h | |
| parent | dd8523316a7809f7e5ef120903e876d266064350 (diff) | |
| download | Qt-830317bda972cc121ff8204f43d639c183e754ad.zip Qt-830317bda972cc121ff8204f43d639c183e754ad.tar.gz Qt-830317bda972cc121ff8204f43d639c183e754ad.tar.bz2 | |
qdoc: Fixed the case where the property and type names are the same.
Also simplified some code.
Task-number: QTBUG-6340
(cherry picked from commit f14b644004498dc6fb1a9437b81e3164e89bfdb5)
Diffstat (limited to 'tools/qdoc3/cppcodemarker.h')
| -rw-r--r-- | tools/qdoc3/cppcodemarker.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/qdoc3/cppcodemarker.h b/tools/qdoc3/cppcodemarker.h index 2dcf400..eca3936 100644 --- a/tools/qdoc3/cppcodemarker.h +++ b/tools/qdoc3/cppcodemarker.h @@ -81,9 +81,10 @@ class CppCodeMarker : public CodeMarker Status status); QList<Section> qmlSections(const QmlClassNode* qmlClassNode, SynopsisStyle style); - const Node *resolveTarget(const QString& target, - const Tree *tree, - const Node *relative); + const Node* resolveTarget(const QString& target, + const Tree* tree, + const Node* relative, + const Node* self = 0); private: QString addMarkUp(const QString& protectedCode, |