diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-10-11 22:48:10 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-10-11 22:48:10 (GMT) |
| commit | 76b29d542e13184da81129ea3f7373ffd71ceedc (patch) | |
| tree | c18a7af8ae2f70d6fcda5b74cd00161241596beb /src/declarative/qml/qmlvme.cpp | |
| parent | ac507b4752dcd065038130d224910a6dc64f8f37 (diff) | |
| parent | 76448b41bb9c6212d2534f0597f9973c881c77bd (diff) | |
| download | Qt-76b29d542e13184da81129ea3f7373ffd71ceedc.zip Qt-76b29d542e13184da81129ea3f7373ffd71ceedc.tar.gz Qt-76b29d542e13184da81129ea3f7373ffd71ceedc.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlvme.cpp')
| -rw-r--r-- | src/declarative/qml/qmlvme.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index 93c02b3..d4921b6 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -549,7 +549,9 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, case QmlInstruction::StoreScript: { QObject *target = stack.top(); - cp->addScript(primitives.at(instr.storeScript.value), target); + cp->addScript(primitives.at(instr.storeScript.value), target, + primitives.at(instr.storeScript.fileName), + instr.storeScript.lineNumber); } break; @@ -579,12 +581,11 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, if (stack.count() == 1 && bindingSkipList.testBit(coreIndex)) break; - QmlBinding *bind = new QmlBinding((void *)datas.at(instr.assignBinding.value).constData(), comp, context, ctxt, 0); + QmlBinding *bind = new QmlBinding((void *)datas.at(instr.assignBinding.value).constData(), comp, context, ctxt, comp->url, instr.line, 0); bindValues.append(bind); bind->m_mePtr = &bindValues.values[bindValues.count - 1]; bind->setTarget(mp); bind->addToObject(target); - bind->setSourceLocation(comp->url, instr.line); } break; |