diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-04-28 03:49:13 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-04-28 03:49:13 (GMT) |
| commit | c8daf2ac917a90a54db780e8844a770a2cd0b464 (patch) | |
| tree | 987a3818d51382b115537fd5774487964eaaa235 /src/declarative/qml/qmlvme.cpp | |
| parent | 0c12a5a3bc547f2ba55350509adff3f66e73ba46 (diff) | |
| parent | 4927fb460e12ee8b4dada1025ad042d2b6b9b6f4 (diff) | |
| download | Qt-c8daf2ac917a90a54db780e8844a770a2cd0b464.zip Qt-c8daf2ac917a90a54db780e8844a770a2cd0b464.tar.gz Qt-c8daf2ac917a90a54db780e8844a770a2cd0b464.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 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index b6d9173..62a0864 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -860,14 +860,10 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in #endif QObject *target = stack.top(); - QmlAttachedPropertiesFunc attachFunc = - QmlMetaType::attachedPropertiesFunc(datas.at(instr.fetchAttached.idx)); - if(!attachFunc) - VME_EXCEPTION("No such attached object" << primitives.at(instr.fetchAttached.idx)); + QObject *qmlObject = qmlAttachedPropertiesObjectById(instr.fetchAttached.id, target); - QObject *qmlObject = attachFunc(target); if(!qmlObject) - VME_EXCEPTION("Internal error - unable to create attached object" << primitives.at(instr.fetchAttached.idx)); + VME_EXCEPTION("Unable to create attached object"); stack.push(qmlObject); } |