diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-04-19 22:45:05 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-04-20 09:15:30 +0200 |
| commit | b9b6755ff8d89a24ea142c482494fa9f78c8229e (patch) | |
| tree | 34c4f1fa85488933d5bcc476f92ff082178629bd /src/qml/qml/qqmlvme.cpp | |
| parent | 8109d47545a488ead9fac525968c360abb1fd23e (diff) | |
Disable the old v4 engine by default
Left the code in there, as a reference for how we might want to
build up binding evaluation in the new v4.
Change-Id: I5c81ea986d642b524fb02087d819b39c4e3fb257
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/qqmlvme.cpp')
| -rw-r--r-- | src/qml/qml/qqmlvme.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlvme.cpp b/src/qml/qml/qqmlvme.cpp index 8198eeca66..91c2226248 100644 --- a/src/qml/qml/qqmlvme.cpp +++ b/src/qml/qml/qqmlvme.cpp @@ -57,7 +57,9 @@ #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> @@ -446,10 +448,12 @@ 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; @@ -841,10 +845,11 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, } QML_END_INSTR(StoreBinding) +#ifdef QT_USE_OLD_V4 QML_BEGIN_INSTR(StoreV4Binding) - QObject *target = + QObject *target = objects.at(objects.count() - 1 - instr.owner); - QObject *scope = + QObject *scope = objects.at(objects.count() - 1 - instr.context); int propertyIdx = (instr.property & 0x0000FFFF); @@ -879,6 +884,7 @@ QObject *QQmlVME::run(QList<QQmlError> *errors, } } QML_END_INSTR(StoreV4Binding) +#endif QML_BEGIN_INSTR(StoreV8Binding) QObject *target = |