diff options
| author | Ian Walters <ian.walters@nokia.com> | 2009-05-05 05:18:20 (GMT) |
|---|---|---|
| committer | Ian Walters <ian.walters@nokia.com> | 2009-05-05 05:18:20 (GMT) |
| commit | 872c45c272ca71e8618475060aa28075e83fffce (patch) | |
| tree | 5a5a2ed3eaf15470160d0d7fe36a67b39c41e5ef /src/declarative/qml/qmlvme.cpp | |
| parent | 415708f85341448c6f30bbca6e31e48dbfde72a5 (diff) | |
| parent | 0725ca189ad30ec54a2a7a054404a50f20e2bfed (diff) | |
| download | Qt-872c45c272ca71e8618475060aa28075e83fffce.zip Qt-872c45c272ca71e8618475060aa28075e83fffce.tar.gz Qt-872c45c272ca71e8618475060aa28075e83fffce.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 | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index a3bfd62..ad3d1d5 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -277,27 +277,6 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in } break; - case QmlInstruction::CreateCustomObject: - { -#ifdef Q_ENABLE_PERFORMANCE_LOG - QFxCompilerTimer<QFxCompiler::InstrCreateCustomObject> cc; -#endif - QVariant v = - types.at(instr.createCustom.type).parser->create(datas.at(instr.createCustom.data)); - // XXX - QObject *o = QmlMetaType::toQObject(v); - if (!o) - VME_EXCEPTION("Unable to create" << types.at(instr.create.type).className); - QmlEngine::setContextForObject(o, QmlContext::activeContext()); - - if (!stack.isEmpty()) { - QObject *parent = stack.top(); - o->setParent(parent); - } - stack.push(o); - } - break; - case QmlInstruction::SetId: { #ifdef Q_ENABLE_PERFORMANCE_LOG |