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

Conflicts:
	src/declarative/util/qfxperf.cpp

5 files changed, 2 insertions, 27 deletions

diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp
index 3029934..46695b7 100644
--- a/src/declarative/qml/qmlcompiler.cpp
+++ b/src/declarative/qml/qmlcompiler.cpp
@@ -470,7 +470,7 @@ bool QmlCompiler::compile(QmlEngine *engine,
                           QmlCompiledComponent *out)
 {
 #ifdef Q_ENABLE_PERFORMANCE_LOG
-    QFxPerfTimer<QFxPerf::Compile> pc;
+    QFxPerfTimer<QFxPerf::Compilation> pc;
 #endif
     exceptions.clear();
 
diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp
index 24b5dd2..78137e8 100644
--- a/src/declarative/qml/qmlcomponent.cpp
+++ b/src/declarative/qml/qmlcomponent.cpp
@@ -458,9 +458,6 @@ QObject *QmlComponent::beginCreate(QmlContext *context)
         return 0;
     }
 
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QFxPerfTimer<QFxPerf::CreateComponent> perf;
-#endif
     if (!d->engine->d_func()->rootComponent)
         d->engine->d_func()->rootComponent = this;
 
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index c67c220..18f28ed 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -1275,9 +1275,6 @@ QmlContextScriptClass::queryProperty(const QScriptValue &object,
                                          QueryFlags flags, uint *id)
 {
     Q_UNUSED(flags);
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QFxPerfTimer<QFxPerf::ContextQuery> perf;
-#endif
     QmlContext *bindContext = 
         static_cast<QmlContext*>(object.data().toQObject());
     QueryFlags rv = 0;
@@ -1308,9 +1305,6 @@ QScriptValue QmlContextScriptClass::property(const QScriptValue &object,
                                                  const QScriptString &name, 
                                                  uint id)
 {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QFxPerfTimer<QFxPerf::ContextProperty> perf;
-#endif
     QmlContext *bindContext = 
         static_cast<QmlContext*>(object.data().toQObject());
 
@@ -1369,9 +1363,6 @@ void QmlContextScriptClass::setProperty(QScriptValue &object,
 {
     Q_UNUSED(name);
 
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QFxPerfTimer<QFxPerf::ObjectSetProperty> perf;
-#endif
     QmlContext *bindContext = 
         static_cast<QmlContext*>(object.data().toQObject());
 
@@ -1422,9 +1413,6 @@ QScriptClass::QueryFlags QmlObjectScriptClass::queryProperty(const QScriptValue
                                     QueryFlags flags, uint *id)
 {
     Q_UNUSED(flags);
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QFxPerfTimer<QFxPerf::ObjectQuery> perf;
-#endif
     QObject *obj = object.data().toQObject();
     QueryFlags rv = 0;
     QString propName = name.toString();
@@ -1443,9 +1431,6 @@ QScriptValue QmlObjectScriptClass::property(const QScriptValue &object,
                                 const QScriptString &name, 
                                 uint id)
 {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QFxPerfTimer<QFxPerf::ObjectProperty> perf;
-#endif
     QObject *obj = object.data().toQObject();
 
 #ifdef PROPERTY_DEBUG
@@ -1472,9 +1457,6 @@ void QmlObjectScriptClass::setProperty(QScriptValue &object,
 {
     Q_UNUSED(name);
 
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QFxPerfTimer<QFxPerf::ObjectSetProperty> perf;
-#endif
     QObject *obj = object.data().toQObject();
 
 #ifdef PROPERTY_DEBUG
diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index 3aa4f1d..4f39ebc 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -196,10 +196,6 @@ QmlMetaProperty::QmlMetaProperty(QObject *obj, const QString &name)
 QmlMetaProperty::QmlMetaProperty(QObject *obj, const QString &name, QmlContext *ctxt)
 : d(new QmlMetaPropertyPrivate)
 {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
-    QFxPerfTimer<QFxPerf::MetaProperty> perf;
-#endif
-
     d->context = ctxt;
     initProperty(obj, name);
 }
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index e68afcc..c85524f 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -201,7 +201,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
 
 
 #ifdef Q_ENABLE_PERFORMANCE_LOG
-    QFxPerfTimer<QFxPerf::CompileRun> cr;
+    QFxPerfTimer<QFxPerf::VMEExecution> cr;
 #endif
     QmlEnginePrivate::SimpleList<QmlBindableValue> bindValues;
     QmlEnginePrivate::SimpleList<QmlParserStatus> parserStatus;