diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2009-08-27 05:17:37 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2009-08-27 05:17:37 (GMT) |
| commit | fd2616977e5e03afa3be9b455bc0a6be19f9132f (patch) | |
| tree | b71404860117132253b7e76832adf28748ca81cb /src/declarative/qml/qmlvme.cpp | |
| parent | 12f4fc296578fb30ac1bf690b3eeba176b72205a (diff) | |
| parent | 219e2fa7ace74d87fda4ed8c3a2a75005fab10b9 (diff) | |
| download | Qt-fd2616977e5e03afa3be9b455bc0a6be19f9132f.zip Qt-fd2616977e5e03afa3be9b455bc0a6be19f9132f.tar.gz Qt-fd2616977e5e03afa3be9b455bc0a6be19f9132f.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/extra/qmlbehavior.cpp
src/declarative/extra/qmlbehavior.h
Diffstat (limited to 'src/declarative/qml/qmlvme.cpp')
| -rw-r--r-- | src/declarative/qml/qmlvme.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index 7455eb4..930e6e4 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -591,13 +591,12 @@ QObject *QmlVME::run(QStack<QObject *> &stack, QmlContext *ctxt, QmlCompiledData case QmlInstruction::StoreValueSource: { - QmlPropertyValueSource *vs = - static_cast<QmlPropertyValueSource *>(stack.pop()); - QObject *target = - stack.at(stack.count() - 1 - instr.assignValueSource.owner); + QObject *obj = stack.pop(); + QmlPropertyValueSource *vs = reinterpret_cast<QmlPropertyValueSource *>(reinterpret_cast<char *>(obj) + instr.assignValueSource.castValue); + QObject *target = stack.at(stack.count() - 1 - instr.assignValueSource.owner); QmlMetaProperty prop; prop.restore(instr.assignValueSource.property, target, ctxt); - vs->setParent(target); + obj->setParent(target); vs->setTarget(prop); } break; |