diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-11-04 02:48:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-05 23:47:27 +0100 |
| commit | 3a61da32e485621c9afbd453d22cbe1f6c25479e (patch) | |
| tree | 7c7b145758c0370b23b0287f33d1124ae1d49660 /src/qml/qml/qqmljavascriptexpression_p.h | |
| parent | 22b83ec28a7dfebe9d47ff5c98fddfdb492e4304 (diff) | |
Ensure the this object is set correctly to the scope object in binding expressions
This is a regression from 5.1
Change-Id: I61ad372a02d937c195dad74bd9fcb8fd4410d97a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/qml/qml/qqmljavascriptexpression_p.h')
| -rw-r--r-- | src/qml/qml/qqmljavascriptexpression_p.h | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/src/qml/qml/qqmljavascriptexpression_p.h b/src/qml/qml/qqmljavascriptexpression_p.h index 44357046ee..7d65f1c9cc 100644 --- a/src/qml/qml/qqmljavascriptexpression_p.h +++ b/src/qml/qml/qqmljavascriptexpression_p.h @@ -117,8 +117,6 @@ public: QV4::ReturnedValue evaluate(QQmlContextData *, const QV4::ValueRef function, bool *isUndefined); QV4::ReturnedValue evaluate(QQmlContextData *, const QV4::ValueRef function, QV4::CallData *callData, bool *isUndefined); - inline bool requiresThisObject() const; - inline void setRequiresThisObject(bool v); inline bool notifyOnValueChanged() const; void setNotifyOnValueChanged(bool v); @@ -183,7 +181,6 @@ private: QPointerValuePair<VTable, QQmlDelayedError> m_vtable; // We store some flag bits in the following flag pointers. - // m_scopeObject:flag1 - requiresThisObject // activeGuards:flag1 - notifyOnValueChanged // activeGuards:flag2 - useSharedContext QBiPointer<QObject, DeleteWatcher> m_scopeObject; @@ -215,16 +212,6 @@ bool QQmlJavaScriptExpression::DeleteWatcher::wasDeleted() const return *_w == 0; } -bool QQmlJavaScriptExpression::requiresThisObject() const -{ - return m_scopeObject.flag(); -} - -void QQmlJavaScriptExpression::setRequiresThisObject(bool v) -{ - m_scopeObject.setFlagValue(v); -} - bool QQmlJavaScriptExpression::notifyOnValueChanged() const { return activeGuards.flag(); |