Merge branch 'master' of git://gitorious.org/qt/qt

1 files changed, 3 insertions, 3 deletions

diff --git a/tools/qdoc3/javadocgenerator.h b/tools/qdoc3/javadocgenerator.h
index aac938e..5431c38 100644
--- a/tools/qdoc3/javadocgenerator.h
+++ b/tools/qdoc3/javadocgenerator.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the tools applications of the Qt Toolkit.
 **
@@ -34,7 +34,7 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
 ** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** contact the sales department at http://www.qtsoftware.com/contact.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -68,7 +68,7 @@ protected:
     void generateClassLikeNode(const InnerNode *inner, CodeMarker *marker);
     void generateFakeNode( const FakeNode *fake, CodeMarker *marker );
 
-    void generateText( const Text& text, const Node *relative, CodeMarker *marker );
+    bool generateText( const Text& text, const Node *relative, CodeMarker *marker );
     void generateBody( const Node *node, CodeMarker *marker );
     void generateAlsoList( const Node *node, CodeMarker *marker );