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/qqmlcontext.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/qqmlcontext.cpp')
| -rw-r--r-- | src/qml/qml/qqmlcontext.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlcontext.cpp b/src/qml/qml/qqmlcontext.cpp index e0a16d1f44..b865ff055b 100644 --- a/src/qml/qml/qqmlcontext.cpp +++ b/src/qml/qml/qqmlcontext.cpp @@ -48,7 +48,9 @@ #include "qqmlengine_p.h" #include "qqmlengine.h" #include "qqmlinfo.h" +#ifdef QT_USE_OLD_V4 #include <private/qv4bindings_p.h> +#endif #include <private/qv8bindings_p.h> #include <qjsengine.h> @@ -518,7 +520,11 @@ QQmlContextData::QQmlContextData() publicContext(0), activeVMEData(0), propertyNames(0), contextObject(0), imports(0), childContexts(0), nextChild(0), prevChild(0), expressions(0), contextObjects(0), contextGuards(0), idValues(0), idValueCount(0), linkedContext(0), - componentAttached(0), v4bindings(0), v8bindings(0) + componentAttached(0), +#ifdef QT_USE_OLD_V4 + v4bindings(0), +#endif + v8bindings(0) { } @@ -528,7 +534,11 @@ QQmlContextData::QQmlContextData(QQmlContext *ctxt) publicContext(ctxt), activeVMEData(0), propertyNames(0), contextObject(0), imports(0), childContexts(0), nextChild(0), prevChild(0), expressions(0), contextObjects(0), contextGuards(0), idValues(0), idValueCount(0), linkedContext(0), - componentAttached(0), v4bindings(0), v8bindings(0) + componentAttached(0), +#ifdef QT_USE_OLD_V4 + v4bindings(0), +#endif + v8bindings(0) { } @@ -636,8 +646,10 @@ void QQmlContextData::destroy() if (imports) imports->release(); +#ifdef QT_USE_OLD_V4 if (v4bindings) v4bindings->release(); +#endif if (v8bindings) v8bindings->release(); |