diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2012-03-09 11:40:44 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-30 12:55:23 +0200 |
| commit | 833336fa963b3cd9f1996d7d255098f523dfa580 (patch) | |
| tree | 98c74d813bbd4068392ccb46346fe9e68adad687 /src/qml/qml/qqmlexpression_p.h | |
| parent | 5534768481f478e93b8b3bd0f7fb0327da5af221 (diff) | |
Loosen shared binding tests
Previously we blocked all function calls, but only because we were trying
to prevent "eval" calls from appearing in shared bindings. Instead this
test allows function calls as long as the identifier "eval" doesn't
appear.
This also exposed a crash with v8 bindings that is also fixed.
Change-Id: I22eefd290c7b82d9c01b2cd2907a46e560ae4db9
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlexpression_p.h')
| -rw-r--r-- | src/qml/qml/qqmlexpression_p.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlexpression_p.h b/src/qml/qml/qqmlexpression_p.h index d3d27f259d..d32e2d314c 100644 --- a/src/qml/qml/qqmlexpression_p.h +++ b/src/qml/qml/qqmlexpression_p.h @@ -96,7 +96,6 @@ public: bool expressionFunctionValid:1; bool expressionFunctionRewritten:1; - bool extractExpressionFromFunction:1; // "Inherited" from QQmlJavaScriptExpression static QString expressionIdentifier(QQmlJavaScriptExpression *); @@ -113,8 +112,6 @@ public: int line; int column; QString name; //function name, hint for the debugger - - QQmlRefCount *dataRef; }; QQmlExpressionPrivate *QQmlExpressionPrivate::get(QQmlExpression *expr) |