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

Conflicts:
	src/declarative/qml/qmlcomponentjs.cpp
	src/declarative/qml/qmlcomponentjs_p.h
	src/declarative/qml/qmlcomponentjs_p_p.h

1 files changed, 18 insertions, 0 deletions

diff --git a/src/declarative/qml/qmlcompiler_p.h b/src/declarative/qml/qmlcompiler_p.h
index 9a37832..51c165e 100644
--- a/src/declarative/qml/qmlcompiler_p.h
+++ b/src/declarative/qml/qmlcompiler_p.h
@@ -255,6 +255,8 @@ private:
 
     void addId(const QString &, QmlParser::Object *);
 
+    void dumpStats();
+
     struct BindingReference {
         QmlParser::Variant expression;
         QmlParser::Property *property;
@@ -280,9 +282,25 @@ private:
     };
     ComponentCompileState compileState;
 
+    struct ComponentStat
+    {
+        ComponentStat() 
+            : ids(0), scriptBindings(0), optimizedBindings(0), objects(0) {}
+
+        int lineNumber;
+
+        int ids;
+        int scriptBindings;
+        int optimizedBindings;
+        int objects;
+    };
+    ComponentStat componentStat;
+
     void saveComponentState();
+
     ComponentCompileState componentState(QmlParser::Object *);
     QHash<QmlParser::Object *, ComponentCompileState> savedCompileStates;
+    QList<ComponentStat> savedComponentStats;
 
     QList<QmlError> exceptions;
     QmlCompiledData *output;