diff options
-rw-r--r-- | src/declarative/qml/qmlcompiler.cpp | 4 | ||||
-rw-r--r-- | src/declarative/qml/qmlinstruction.cpp | 2 | ||||
-rw-r--r-- | src/declarative/qml/qmlinstruction_p.h | 6 |
3 files changed, 2 insertions, 10 deletions
diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index fe3da57..04a488d 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -1102,8 +1102,6 @@ bool QmlCompiler::compileListProperty(QmlParser::Property *prop, QmlInstruction assign; assign.type = QmlInstruction::AssignObjectList; assign.line = prop->location.start.line; - assign.assignObject.property = output->indexForByteArray(prop->name); - assign.assignObject.castValue = 0; output->bytecode << assign; } else { COMPILE_EXCEPTION("Cannot assign primitives to lists"); @@ -1130,8 +1128,6 @@ bool QmlCompiler::compileListProperty(QmlParser::Property *prop, QmlInstruction assign; assign.type = QmlInstruction::AssignObjectList; assign.line = v->location.start.line; - assign.assignObject.property = output->indexForByteArray(prop->name); - assign.assignObject.castValue = 0; output->bytecode << assign; } else if (v->value.isScript()) { if (assignedBinding) diff --git a/src/declarative/qml/qmlinstruction.cpp b/src/declarative/qml/qmlinstruction.cpp index af1489a..bcc1f0d 100644 --- a/src/declarative/qml/qmlinstruction.cpp +++ b/src/declarative/qml/qmlinstruction.cpp @@ -146,7 +146,7 @@ void QmlCompiledComponent::dump(QmlInstruction *instr, int idx) qWarning() << idx << "\t" << line << "\t" << "COMPLETE\t\t" << instr->complete.castValue; break; case QmlInstruction::AssignObjectList: - qWarning() << idx << "\t" << line << "\t" << "ASSIGN_OBJECT_LIST\t" << instr->assignObject.property << "\t" << instr->assignObject.castValue << "\t\t" << ((instr->assignObject.property == -1)?QByteArray("default"):datas.at(instr->assignObject.property)); + qWarning() << idx << "\t" << line << "\t" << "ASSIGN_OBJECT_LIST\t"; break; case QmlInstruction::FetchAttached: qWarning() << idx << "\t" << line << "\t" << "FETCH_ATTACHED\t\t" << instr->fetchAttached.id; diff --git a/src/declarative/qml/qmlinstruction_p.h b/src/declarative/qml/qmlinstruction_p.h index 5a1729f..bdbbaff 100644 --- a/src/declarative/qml/qmlinstruction_p.h +++ b/src/declarative/qml/qmlinstruction_p.h @@ -122,7 +122,7 @@ public: BeginObject, /* begin */ CompleteObject, /* complete */ - AssignObjectList, /* assignObject */ + AssignObjectList, /* NA */ FetchAttached, /* fetchAttached */ FetchQmlList, /* fetchQmlList */ @@ -170,10 +170,6 @@ public: } setId; struct { int property; - int castValue; - } assignObject; - struct { - int property; } assignValueSource; struct { int property; |