aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlnotifier.cpp
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@digia.com>2013-04-19 22:45:05 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-04-20 09:15:30 +0200
commitb9b6755ff8d89a24ea142c482494fa9f78c8229e (patch)
tree34c4f1fa85488933d5bcc476f92ff082178629bd /src/qml/qml/qqmlnotifier.cpp
parent8109d47545a488ead9fac525968c360abb1fd23e (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/qqmlnotifier.cpp')
-rw-r--r--src/qml/qml/qqmlnotifier.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/qml/qml/qqmlnotifier.cpp b/src/qml/qml/qqmlnotifier.cpp
index 3253a5f0e8..7e9b6b4052 100644
--- a/src/qml/qml/qqmlnotifier.cpp
+++ b/src/qml/qml/qqmlnotifier.cpp
@@ -51,14 +51,18 @@ typedef void (*Callback)(QQmlNotifierEndpoint *, void **);
void QQmlBoundSignal_callback(QQmlNotifierEndpoint *, void **);
void QQmlJavaScriptExpressionGuard_callback(QQmlNotifierEndpoint *, void **);
void QQmlVMEMetaObjectEndpoint_callback(QQmlNotifierEndpoint *, void **);
+#ifdef QT_USE_OLD_V4
void QV4BindingsSubscription_callback(QQmlNotifierEndpoint *, void **);
+#endif
static Callback QQmlNotifier_callbacks[] = {
0,
QQmlBoundSignal_callback,
QQmlJavaScriptExpressionGuard_callback,
- QQmlVMEMetaObjectEndpoint_callback,
- QV4BindingsSubscription_callback
+ QQmlVMEMetaObjectEndpoint_callback
+#ifdef QT_USE_OLD_V4
+ , QV4BindingsSubscription_callback
+#endif
};
void QQmlNotifier::emitNotify(QQmlNotifierEndpoint *endpoint, void **a)