summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlvme.cpp
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-13 04:14:28 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-13 04:14:28 (GMT)
commit852f899318e6c50b46ece61c075846c266bd4107 (patch)
tree47060b4e7e0ca12587d3df2f0648bcced4f90b52 /src/declarative/qml/qmlvme.cpp
parent1a2621707da2d41653e9fd2cbf92002fd55b11c5 (diff)
downloadQt-852f899318e6c50b46ece61c075846c266bd4107.zip
Qt-852f899318e6c50b46ece61c075846c266bd4107.tar.gz
Qt-852f899318e6c50b46ece61c075846c266bd4107.tar.bz2
Remove AssignSignal 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 dc9ef06..51534e7 100644
--- a/src/declarative/qml/qmlvme.cpp
+++ b/src/declarative/qml/qmlvme.cpp
@@ -88,7 +88,6 @@ Q_DECLARE_PERFORMANCE_LOG(QFxCompiler) {
Q_DECLARE_PERFORMANCE_METRIC(InstrStoreSignal);
Q_DECLARE_PERFORMANCE_METRIC(InstrStoreObjectQmlList);
Q_DECLARE_PERFORMANCE_METRIC(InstrAssignConstant);
- Q_DECLARE_PERFORMANCE_METRIC(InstrAssignSignal);
Q_DECLARE_PERFORMANCE_METRIC(InstrAssignSignalObject);
Q_DECLARE_PERFORMANCE_METRIC(InstrAssignBinding);
Q_DECLARE_PERFORMANCE_METRIC(InstrAssignCompiledBinding);
@@ -138,7 +137,6 @@ Q_DEFINE_PERFORMANCE_LOG(QFxCompiler, "QFxCompiler") {
Q_DEFINE_PERFORMANCE_METRIC(InstrStoreSignal, "StoreSignal");
Q_DEFINE_PERFORMANCE_METRIC(InstrStoreObjectQmlList, "StoreObjectQmlList");
Q_DEFINE_PERFORMANCE_METRIC(InstrAssignConstant, "AssignConstant");
- Q_DEFINE_PERFORMANCE_METRIC(InstrAssignSignal, "AssignSignal");
Q_DEFINE_PERFORMANCE_METRIC(InstrAssignSignalObject, "AssignSignalObject");
Q_DEFINE_PERFORMANCE_METRIC(InstrAssignBinding, "AssignBinding");
Q_DEFINE_PERFORMANCE_METRIC(InstrAssignCompiledBinding, "AssignCompiledBinding");
@@ -356,37 +354,6 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in
}
break;
- case QmlInstruction::AssignSignal:
- {
-#ifdef Q_ENABLE_PERFORMANCE_LOG
- QFxCompilerTimer<QFxCompiler::InstrAssignSignal> cc;
-#endif
- // Fixup instruction
- QObject *target = stack.top();
- int sigIdx = instr.assignSignal.signal;
- const QByteArray &pr = datas.at(sigIdx);
-
- QmlMetaProperty prop(target, QLatin1String(pr));
- if (prop.type() & QmlMetaProperty::SignalProperty) {
- int coreIdx = prop.coreIndex();
- int primRef = instr.assignSignal.value;
- instr.type = QmlInstruction::StoreSignal;
- instr.storeSignal.signalIndex = coreIdx;
- instr.storeSignal.value = primRef;
- --ii;
- } else if (prop.type() & QmlMetaProperty::Property) {
- int prop = sigIdx;
- int primRef = instr.assignSignal.value;
- instr.type = QmlInstruction::AssignConstant;
- instr.assignConstant.property = prop;
- instr.assignConstant.constant = primRef;
- --ii;
- } else {
- VME_EXCEPTION("Cannot assign a signal to property" << pr);
- }
- }
- break;
-
case QmlInstruction::AssignSignalObject:
{
#ifdef Q_ENABLE_PERFORMANCE_LOG