summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlvme.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-26 08:13:44 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-26 08:13:44 (GMT)
commita06c0fe5a2c9eebf5e7cceb06f64e725b42715bd (patch)
tree93d61bae106349e90959b2e5db3d1f636ad8ccfb /src/declarative/qml/qmlvme.cpp
parente7c9b51fecc78d8b2f592013513e07a8c0047a2e (diff)
downloadQt-a06c0fe5a2c9eebf5e7cceb06f64e725b42715bd.zip
Qt-a06c0fe5a2c9eebf5e7cceb06f64e725b42715bd.tar.gz
Qt-a06c0fe5a2c9eebf5e7cceb06f64e725b42715bd.tar.bz2
Remove AssignStackObject instruction
Diffstat (limited to 'src/declarative/qml/qmlvme.cpp')
-rw-r--r--src/declarative/qml/qmlvme.cpp33
1 files changed, 0 insertions, 33 deletions
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp
index e2441c6..991c7ad 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -101,7 +101,6 @@ Q_DECLARE_PERFORMANCE_LOG(QFxCompiler) {
Q_DECLARE_PERFORMANCE_METRIC(InstrPopFetchedObject);
Q_DECLARE_PERFORMANCE_METRIC(InstrPopQList);
Q_DECLARE_PERFORMANCE_METRIC(InstrPushProperty);
- Q_DECLARE_PERFORMANCE_METRIC(InstrAssignStackObject);
Q_DECLARE_PERFORMANCE_METRIC(InstrStoreStackObject);
Q_DECLARE_PERFORMANCE_METRIC(Dummy);
}
@@ -141,7 +140,6 @@ Q_DEFINE_PERFORMANCE_LOG(QFxCompiler, "QFxCompiler") {
Q_DEFINE_PERFORMANCE_METRIC(InstrPopFetchedObject, "PopFetchedObject");
Q_DEFINE_PERFORMANCE_METRIC(InstrPopQList, "PopQList");
Q_DEFINE_PERFORMANCE_METRIC(InstrPushProperty, "PushProperty");
- Q_DEFINE_PERFORMANCE_METRIC(InstrAssignStackObject, "AssignStackObject");
Q_DEFINE_PERFORMANCE_METRIC(InstrStoreStackObject, "StoreStackObject");
Q_DEFINE_PERFORMANCE_METRIC(Dummy, "Dummy");
}
@@ -934,37 +932,6 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
}
break;
- case QmlInstruction::AssignStackObject:
- {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
- QFxCompilerTimer<QFxCompiler::InstrAssignStackObject> cc;
-#endif
-
- QObject *obj = savedObjects[instr.assignStackObject.object];
- const QmlMetaProperty &prop =
- pushedProperties.at(instr.assignStackObject.property);
-
-
- const QMetaObject *mo =
- QmlMetaType::rawMetaObjectForType(prop.propertyType());
- const QMetaObject *assignMo = obj->metaObject();
-
- bool found = false;
- while(!found && assignMo) {
- if (assignMo == mo)
- found = true;
- else
- assignMo = assignMo->superClass();
- }
-
- if (!found)
- VME_EXCEPTION("Unable to assign object");
-
- instr.type = QmlInstruction::StoreStackObject;
- --ii;
- }
- break;
-
case QmlInstruction::StoreStackObject:
{
#ifdef Q_ENABLE_PERFORMANCE_LOG