summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/javacodemarker.cpp
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.cpp
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.cpp')
-rw-r--r--tools/qdoc3/javacodemarker.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/qdoc3/javacodemarker.cpp b/tools/qdoc3/javacodemarker.cpp
index 1918cd8..c9a8f60 100644
--- a/tools/qdoc3/javacodemarker.cpp
+++ b/tools/qdoc3/javacodemarker.cpp
@@ -155,8 +155,10 @@ QList<Section> JavaCodeMarker::sections(const InnerNode * /* inner */, SynopsisS
return QList<Section>();
}
-const Node *JavaCodeMarker::resolveTarget(const QString &target, const Tree *tree,
- const Node *relative)
+const Node *JavaCodeMarker::resolveTarget(const QString &target,
+ const Tree *tree,
+ const Node *relative,
+ const Node* /* self */)
{
if (target.endsWith("()")) {
const FunctionNode *func;