diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:29:32 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-19 12:37:03 +0100 |
| commit | 4821058f10118be55a541ad39e25ec9165cca3b3 (patch) | |
| tree | 167973e3c68fc442b0e37d6f628f3fdbe759f15a /src/qml/qml/v8/qv8valuetypewrapper.cpp | |
| parent | 83f11e33745180e9370d484cbcedd0bac020c9dd (diff) | |
| parent | 26d5f2e833f0e3686aaa27e695bbfab5fbd808ad (diff) | |
Merge master into api_changes
Conflicts:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/util/qquickimageprovider.cpp
tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp
Change-Id: Ie78ba2fabd32f4812bcae9dbdd66ed289dc11dcb
Diffstat (limited to 'src/qml/qml/v8/qv8valuetypewrapper.cpp')
| -rw-r--r-- | src/qml/qml/v8/qv8valuetypewrapper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/qml/v8/qv8valuetypewrapper.cpp b/src/qml/qml/v8/qv8valuetypewrapper.cpp index d54f04a9b0..cf2c13fce9 100644 --- a/src/qml/qml/v8/qv8valuetypewrapper.cpp +++ b/src/qml/qml/v8/qv8valuetypewrapper.cpp @@ -352,8 +352,8 @@ v8::Handle<v8::Value> QV8ValueTypeWrapper::Setter(v8::Local<v8::String> property int columnNumber = frame->GetColumn(); QString url = r->engine->toString(frame->GetScriptName()); - newBinding = new QQmlBinding(&function, reference->object, context); - newBinding->setSourceLocation(url, lineNumber, columnNumber); + newBinding = new QQmlBinding(&function, reference->object, context, + url, lineNumber, columnNumber); newBinding->setTarget(reference->object, cacheData, context); newBinding->setEvaluateFlags(newBinding->evaluateFlags() | QQmlBinding::RequiresThisObject); |