Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits)
  doc:	Fixed some qdoc errors.
  doc:	Fixed some qdoc errors.
  Fix copyright year.
  Fix broken license headers.
  doc:	Fixed some qdoc errors.
  Reusing sheets on Mac OS X 10.5 & above shows painting artifacts.
  doc:	Fixed some qdoc errors.
  QNetworkAccessManager: add method to send custom requests
  doc:	Fixed some qdoc errors.
  Optimization: Avoid calling out to public API function
  Mac: submenu shows up at the wrong position
  Add operator< and qHash for QSharedPointer and fix operator-.
  Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
  Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
  Optimized QLocale to access system locale on demand.
  Fix QRegion under Mac OS X.
  update according to Thiago's comments.
  Changes: add functionality for dbus auto start to qt
  Add license header to this file
  readdir64 is not available on HP-UX
  ...

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/qdoc3/javadocgenerator.cpp b/tools/qdoc3/javadocgenerator.cpp
index 001bd27..eb9c1c9 100644
--- a/tools/qdoc3/javadocgenerator.cpp
+++ b/tools/qdoc3/javadocgenerator.cpp
@@ -145,7 +145,7 @@ void JavadocGenerator::generateTree(const Tree *tree, CodeMarker *marker)
     HtmlGenerator::generateTree(tree, marker);
 }
 
-QString JavadocGenerator::fileExtension(const Node *node)
+QString JavadocGenerator::fileExtension(const Node *node) const
 {
     if (node->type() == Node::Fake) {
         return "html";