diff options
Diffstat (limited to 'src/qml/qml/qqmlexpression_p.h')
| -rw-r--r-- | src/qml/qml/qqmlexpression_p.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/qml/qml/qqmlexpression_p.h b/src/qml/qml/qqmlexpression_p.h index 186e3aebf9..d32e2d314c 100644 --- a/src/qml/qml/qqmlexpression_p.h +++ b/src/qml/qml/qqmlexpression_p.h @@ -82,9 +82,9 @@ public: void init(QQmlContextData *, const QString &, bool, QObject *, const QString &, int, int); void init(QQmlContextData *, const QByteArray &, bool, QObject *, const QString &, int, int); - QVariant value(QObject *secondaryScope = 0, bool *isUndefined = 0); + QVariant value(bool *isUndefined = 0); - v8::Local<v8::Value> v8value(QObject *secondaryScope = 0, bool *isUndefined = 0); + v8::Local<v8::Value> v8value(bool *isUndefined = 0); static inline QQmlExpressionPrivate *get(QQmlExpression *expr); static inline QQmlExpression *get(QQmlExpressionPrivate *expr); @@ -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) |