Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7

4 files changed, 4 insertions, 13 deletions

diff --git a/tools/assistant/tools/assistant/doc/images/assistant-assistant.png b/tools/assistant/tools/assistant/doc/images/assistant-assistant.png
index b825de0..1ff5cc9 100644
--- a/tools/assistant/tools/assistant/doc/images/assistant-assistant.png
+++ b/tools/assistant/tools/assistant/doc/images/assistant-assistant.png
diff --git a/tools/porting/src/codemodel.h b/tools/porting/src/codemodel.h
index cb3088f..04ad178 100644
--- a/tools/porting/src/codemodel.h
+++ b/tools/porting/src/codemodel.h
@@ -96,7 +96,7 @@ class Collection: public QMultiHash<QByteArray, CollectedType *>
 {
 public:
      void add(CollectedType *collectedItem)
-    { insert(collectedItem->name(), collectedItem); }
+    { this->insert(collectedItem->name(), collectedItem); }
 };
 
 typedef Collection<Scope> ScopeCollection;
diff --git a/tools/qdoc3/doc.cpp b/tools/qdoc3/doc.cpp
index 5716626..280f055 100644
--- a/tools/qdoc3/doc.cpp
+++ b/tools/qdoc3/doc.cpp
@@ -2746,18 +2746,6 @@ Doc::SectioningUnit Doc::granularity() const
     }
 }
 
-#if notyet // ###
-Doc::SectioningUnit Doc::sectioningUnit() const
-{
-    if (priv == 0 || priv->extra == 0) {
-	return DocPrivateExtra().sectioningUnit;
-    }
-    else {
-	return priv->extra->sectioningUnit;
-    }
-}
-#endif
-
 const QSet<QString> &Doc::parameterNames() const
 {
     return priv == 0 ? *null_Set_QString() : priv->params;
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 16df0c0..b103981 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -4060,10 +4060,13 @@ int HtmlGenerator::hOffset(const Node *node)
     case Node::Class:
         return 2;
     case Node::Fake:
+        return 1;
+#if 0        
         if (node->doc().briefText().isEmpty())
             return 1;
         else
             return 2;
+#endif        
     case Node::Enum:
     case Node::Typedef:
     case Node::Function: