Changeset 846 for trunk/tools/qdoc3/javacodemarker.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/qdoc3/javacodemarker.cpp (modified) (2 diffs)

trunk/tools/qdoc3/javacodemarker.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -156 +156 @@
 }
 
-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("()")) {