diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-26 07:18:07 (GMT) |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2009-05-26 07:18:07 (GMT) |
commit | b227da8a17cd7b0facc3491d645209e277cb64b7 (patch) | |
tree | 0040b2cf9ce17acbe1e328eceb80df0166db50a8 /src/declarative/qml/qmlvme.cpp | |
parent | e52247f16e608134d1ff663774f930a00a431eb5 (diff) | |
download | Qt-b227da8a17cd7b0facc3491d645209e277cb64b7.zip Qt-b227da8a17cd7b0facc3491d645209e277cb64b7.tar.gz Qt-b227da8a17cd7b0facc3491d645209e277cb64b7.tar.bz2 |
Remove ResolveFetchObject instruction
Diffstat (limited to 'src/declarative/qml/qmlvme.cpp')
-rw-r--r-- | src/declarative/qml/qmlvme.cpp | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index 6d46422..348a706 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -98,7 +98,6 @@ Q_DECLARE_PERFORMANCE_LOG(QFxCompiler) { Q_DECLARE_PERFORMANCE_METRIC(InstrFetchQmlList); Q_DECLARE_PERFORMANCE_METRIC(InstrFetchQList); Q_DECLARE_PERFORMANCE_METRIC(InstrFetchObject); - Q_DECLARE_PERFORMANCE_METRIC(InstrResolveFetchObject); Q_DECLARE_PERFORMANCE_METRIC(InstrPopFetchedObject); Q_DECLARE_PERFORMANCE_METRIC(InstrPopQList); Q_DECLARE_PERFORMANCE_METRIC(InstrPushProperty); @@ -140,7 +139,6 @@ Q_DEFINE_PERFORMANCE_LOG(QFxCompiler, "QFxCompiler") { Q_DEFINE_PERFORMANCE_METRIC(InstrFetchQmlList, "FetchQmlList"); Q_DEFINE_PERFORMANCE_METRIC(InstrFetchQList, "FetchQList"); Q_DEFINE_PERFORMANCE_METRIC(InstrFetchObject, "FetchObject"); - Q_DEFINE_PERFORMANCE_METRIC(InstrResolveFetchObject, "ResolveFetchObject"); Q_DEFINE_PERFORMANCE_METRIC(InstrPopFetchedObject, "PopFetchedObject"); Q_DEFINE_PERFORMANCE_METRIC(InstrPopQList, "PopQList"); Q_DEFINE_PERFORMANCE_METRIC(InstrPushProperty, "PushProperty"); @@ -897,30 +895,6 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in } break; - case QmlInstruction::ResolveFetchObject: - { -#ifdef Q_ENABLE_PERFORMANCE_LOG - QFxCompilerTimer<QFxCompiler::InstrResolveFetchObject> cc; -#endif - QObject *target = stack.top(); - const QByteArray &pr = datas.at(instr.fetch.property); - int idx = qIndexOfProperty(target, pr); - if (idx == -1) - VME_EXCEPTION("Cannot resolve property" << pr); - QMetaProperty prop = target->metaObject()->property(idx); - instr.type = QmlInstruction::FetchObject; - instr.fetch.property = idx; - if (QmlMetaType::isObject(prop.userType())) { - instr.fetch.isObject = true; - } else if (prop.userType() == -1) { - instr.fetch.isObject = false; - } else { - VME_EXCEPTION("Cannot set properties on" << prop.name() << "as it is of unknown type"); - } - ii--; - } - break; - case QmlInstruction::FetchObject: { #ifdef Q_ENABLE_PERFORMANCE_LOG |