diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 16:22:45 +1000 |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 16:22:45 +1000 |
| commit | 250763ffb5cef2173b80b0e67266c937850ff516 (patch) | |
| tree | 1de5e73b20a714c2cd32565873e6f3712a699c0d /src/declarative/qml/qdeclarativevme.cpp | |
| parent | 8bb487e60899382f0890fd675eb272d5cc562882 (diff) | |
| parent | 2d16155bb8fef642ce6bb5cab7cb26b1289a1e6b (diff) | |
Merge branch 'qtquick2' into v8
Conflicts:
src/declarative/qml/qml.pri
Diffstat (limited to 'src/declarative/qml/qdeclarativevme.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativevme.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativevme.cpp b/src/declarative/qml/qdeclarativevme.cpp index 146c856f8f..9082ef06c1 100644 --- a/src/declarative/qml/qdeclarativevme.cpp +++ b/src/declarative/qml/qdeclarativevme.cpp @@ -60,6 +60,7 @@ #include "private/qdeclarativev4bindings_p.h" #include "private/qdeclarativeglobal_p.h" #include "qdeclarativescriptstring.h" +#include "qdeclarativescriptstring_p.h" #include <QStack> #include <QWidget> @@ -639,6 +640,8 @@ QObject *QDeclarativeVME::run(QDeclarativeVMEStack<QObject *> &stack, ss.setContext(ctxt->asQDeclarativeContext()); ss.setScopeObject(scope); ss.setScript(primitives.at(instr.value)); + ss.d.data()->bindingId = instr.bindingId; + ss.d.data()->lineNumber = instr.line; void *a[] = { &ss, 0, &status, &flags }; QMetaObject::metacall(target, QMetaObject::WriteProperty, |