Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60

Conflicts:
	src/s60installs/bwins/QtGuiu.def

1 files changed, 11 insertions, 1 deletions

diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 373002c..b855823 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -767,6 +767,9 @@ FakeNode::FakeNode(InnerNode *parent, const QString& name, SubType subtype)
 }
 
 /*!
+  Returns the fake node's full title, which is usually
+  just title(), but for some SubType values is different
+  from title()
  */
 QString FakeNode::fullTitle() const
 {
@@ -776,6 +779,12 @@ QString FakeNode::fullTitle() const
         else
             return title();
     }
+    else if (sub == Image) {
+        if (title().isEmpty())
+            return name().mid(name().lastIndexOf('/') + 1) + " Image File";
+        else
+            return title();
+    }
     else if (sub == HeaderFile) {
         if (title().isEmpty())
             return name();
@@ -788,13 +797,14 @@ QString FakeNode::fullTitle() const
 }
 
 /*!
+  Returns the subtitle.
  */
 QString FakeNode::subTitle() const
 {
     if (!stle.isEmpty())
         return stle;
 
-    if (sub == File) {
+    if ((sub == File) || (sub == Image)) {
         if (title().isEmpty() && name().contains("/"))
             return name();
     }