summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/javacodemarker.h
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@nokia.com>2010-07-07 07:51:34 (GMT)
committerMartin Smith <martin.smith@nokia.com>2010-07-07 07:51:34 (GMT)
commitf14b644004498dc6fb1a9437b81e3164e89bfdb5 (patch)
treefe8f2e4a4368adf4339aae0f559139455e59118f /tools/qdoc3/javacodemarker.h
parent4ebff202b44bb751a1c37db13963362592e86a6d (diff)
downloadQt-f14b644004498dc6fb1a9437b81e3164e89bfdb5.zip
Qt-f14b644004498dc6fb1a9437b81e3164e89bfdb5.tar.gz
Qt-f14b644004498dc6fb1a9437b81e3164e89bfdb5.tar.bz2
qdoc: Fixed the case where the property and type names are the same.
Also simplified some code. Task-number: QTBUG-6340
Diffstat (limited to 'tools/qdoc3/javacodemarker.h')
-rw-r--r--tools/qdoc3/javacodemarker.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/qdoc3/javacodemarker.h b/tools/qdoc3/javacodemarker.h
index a2d04dd..c2aabc0 100644
--- a/tools/qdoc3/javacodemarker.h
+++ b/tools/qdoc3/javacodemarker.h
@@ -72,7 +72,10 @@ public:
QList<Section> sections(const InnerNode *innerNode, SynopsisStyle style, Status status);
QString functionBeginRegExp( const QString& funcName );
QString functionEndRegExp( const QString& funcName );
- 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 );
};
QT_END_NAMESPACE