Changeset 846 for trunk/tools/qdoc3/cppcodemarker.h

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/cppcodemarker.h (modified) (2 diffs)

trunk/tools/qdoc3/cppcodemarker.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -81 +81 @@
                             Status status);
     QList<Section> qmlSections(const QmlClassNode* qmlClassNode,
-                               SynopsisStyle style);
-    const Node *resolveTarget(const QString& target, 
-                              const Tree *tree, 
-                              const Node *relative);
+                               SynopsisStyle style,
+                               const Tree* tree);
+    const Node* resolveTarget(const QString& target, 
+                              const Tree* tree, 
+                              const Node* relative,
+                              const Node* self = 0);
 
 private: