aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorChristiaan Janssen <christiaan.janssen@nokia.com>2012-01-20 16:34:49 +0100
committerQt by Nokia <qt-info@nokia.com>2012-02-01 07:02:33 +0100
commit3e0b6d2f367ba1c1b99e2957da6dcc823fbf0d21 (patch)
tree5a870a6030b9d1ac587a6fec2624d506dfd6c163 /src/declarative
parent661bccfb6f014cfa4b69c7e375153c901929fa21 (diff)
QmlProfiler: moved v4 tracing to run method
We used to register the calls to update, but that happens only when the binding is created. Evaluation occurs at run. Change-Id: I01927a1eb515a83b4e5c69c6fcf5f358a8e5878f Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/qml/v4/qv4bindings.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/declarative/qml/v4/qv4bindings.cpp b/src/declarative/qml/v4/qv4bindings.cpp
index e646198689..ec7699a504 100644
--- a/src/declarative/qml/v4/qv4bindings.cpp
+++ b/src/declarative/qml/v4/qv4bindings.cpp
@@ -242,11 +242,6 @@ void QV4Bindings::Binding::setEnabled(bool e, QDeclarativePropertyPrivate::Write
void QV4Bindings::Binding::update(QDeclarativePropertyPrivate::WriteFlags flags)
{
- QString bindingUrl;
- if (parent->context())
- bindingUrl = parent->context()->url.toString();
-
- QDeclarativeBindingProfiler prof(bindingUrl, line, column);
parent->run(this, flags);
}
@@ -312,6 +307,8 @@ void QV4Bindings::run(Binding *binding, QDeclarativePropertyPrivate::WriteFlags
return;
}
+ QDeclarativeBindingProfiler prof(context->url.toString(), binding->line, binding->column);
+
binding->updating = true;
if (binding->property & 0xFFFF0000) {
QDeclarativeEnginePrivate *ep = QDeclarativeEnginePrivate::get(context->engine);