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

Conflicts:
	src/declarative/qml/qdeclarativeengine.cpp
	tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp

3 files changed, 13 insertions, 2 deletions

diff --git a/tools/qdoc3/generator.cpp b/tools/qdoc3/generator.cpp
index c8a39ef..80f7e45 100644
--- a/tools/qdoc3/generator.cpp
+++ b/tools/qdoc3/generator.cpp
@@ -226,6 +226,7 @@ void Generator::terminate()
     imageFiles.clear();
     imageDirs.clear();
     outDir = "";
+    QmlClassNode::clear();
 }
 
 Generator *Generator::generatorForFormat(const QString& format)
diff --git a/tools/qdoc3/node.cpp b/tools/qdoc3/node.cpp
index 5415559..d4e4196 100644
--- a/tools/qdoc3/node.cpp
+++ b/tools/qdoc3/node.cpp
@@ -1284,6 +1284,15 @@ QmlClassNode::~QmlClassNode()
 }
 
 /*!
+  Clear the multimap so that subsequent runs don't try to use
+  nodes from a previous run.
+ */
+void QmlClassNode::clear()
+{
+    inheritedBy.clear();
+}
+
+/*!
   The base file name for this kind of node has "qml_"
   prepended to it.
 
@@ -1305,8 +1314,8 @@ QString QmlClassNode::fileBase() const
  */
 void QmlClassNode::addInheritedBy(const QString& base, Node* sub)
 {
-    //qDebug() << "QmlClassNode::addInheritedBy(): insert" << base << sub->name();
     inheritedBy.insert(base,sub);
+    qDebug() << "QmlClassNode::addInheritedBy(): insert" << base << sub->name() << inheritedBy.size();
 }
 
 /*!
@@ -1318,7 +1327,7 @@ void QmlClassNode::subclasses(const QString& base, NodeList& subs)
     if (inheritedBy.count(base) > 0) {
         subs = inheritedBy.values(base);
         qDebug() << "QmlClassNode::subclasses():" <<  inheritedBy.count(base) << base
-                 << "subs:" << subs.size();
+                 << "subs:" << subs.size() << "total size:" << inheritedBy.size();
     }
 }
 
diff --git a/tools/qdoc3/node.h b/tools/qdoc3/node.h
index fd39698..1017813 100644
--- a/tools/qdoc3/node.h
+++ b/tools/qdoc3/node.h
@@ -385,6 +385,7 @@ class QmlClassNode : public FakeNode
     virtual QString fileBase() const;
     static void addInheritedBy(const QString& base, Node* sub);
     static void subclasses(const QString& base, NodeList& subs);
+    static void clear();
 
  public:
     static bool qmlOnly;