diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-05-23 15:23:06 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-05-23 15:33:29 +0200 |
| commit | b71fa87e000c5d72d4b2a7146e450dc41dc69055 (patch) | |
| tree | 3954ea1accf1910a4462d4d185723279ca080dff /src/qml/qml/qqmlvme.cpp | |
| parent | 3636f62101e1ffabc0a3ffa9816c402d1ab2da32 (diff) | |
Remove all references to the old v4 code
The old v4 files have already been removed, so cleanup
all the #ifdef'ed code that still references them.
Change-Id: Ifc5c59add5af36a61586a43b13291d7836cccd78
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 50 |
1 files changed, 0 insertions, 50 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index f3220962eb..0c89e0a5ff 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -57,9 +57,6 @@ #include "qqmlcomponent_p.h" #include "qqmlvmemetaobject_p.h" #include "qqmlcontext_p.h" -#ifdef QT_USE_OLD_V4 -#include <private/qv4bindings_p.h> -#endif #include <private/qv8bindings_p.h> #include "qqmlglobal_p.h" #include <private/qfinitestack_p.h> @@ -444,12 +441,6 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, CTXT->setParent(parentCtxt); if (instr.contextCache != -1) CTXT->setIdPropertyData(COMP->contextCaches.at(instr.contextCache)); -#ifdef QT_USE_OLD_V4 - if (instr.compiledBinding != -1) { - const char *v4data = DATAS.at(instr.compiledBinding).constData(); - CTXT->v4bindings = new QV4Bindings(v4data, CTXT); - } -#endif if (states.count() == 1) { rootContext = CTXT; rootContext->activeVMEData = data; @@ -839,47 +830,6 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, } QML_END_INSTR(StoreBinding) -#ifdef QT_USE_OLD_V4 - QML_BEGIN_INSTR(StoreV4Binding) - QObject *target = - objects.at(objects.count() - 1 - instr.owner); - QObject *scope = - objects.at(objects.count() - 1 - instr.context); - - int propertyIdx = (instr.property & 0x0000FFFF); - - if (instr.isRoot && BINDINGSKIPLIST.testBit(propertyIdx)) - QML_NEXT_INSTR(StoreV4Binding); - - QQmlAbstractBinding *binding = CTXT->v4bindings->configBinding(target, scope, &instr); - bindValues.push(binding); - binding->m_mePtr = &bindValues.top(); - - if (instr.isAlias) { - QQmlAbstractBinding *old = - QQmlPropertyPrivate::setBindingNoEnable(target, - propertyIdx, - instr.propType ? (instr.property >> 16) : -1, - binding); - if (old) { old->destroy(); } - } else { - Q_ASSERT(binding->propertyIndex() == instr.property); - Q_ASSERT(binding->object() == target); - - CLEAN_PROPERTY(target, instr.property); - - binding->addToObject(); - - if (instr.propType == 0) { - // All non-valuetype V4 bindings are safe bindings - QQmlData *data = QQmlData::get(target); - Q_ASSERT(data); - data->setPendingBindingBit(target, propertyIdx); - } - } - QML_END_INSTR(StoreV4Binding) -#endif - QML_BEGIN_INSTR(StoreV8Binding) QObject *target = objects.at(objects.count() - 1 - instr.owner); |