From 3a61da32e485621c9afbd453d22cbe1f6c25479e Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 4 Nov 2013 02:48:16 +0100 Subject: 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 --- src/qml/qml/qqmlbinding_p.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/qml/qml/qqmlbinding_p.h') diff --git a/src/qml/qml/qqmlbinding_p.h b/src/qml/qml/qqmlbinding_p.h index e872482373..9dd63a6e9c 100644 --- a/src/qml/qml/qqmlbinding_p.h +++ b/src/qml/qml/qqmlbinding_p.h @@ -76,9 +76,6 @@ class Q_QML_PRIVATE_EXPORT QQmlBinding : public QQmlJavaScriptExpression, public QQmlAbstractBinding { public: - enum EvaluateFlag { None = 0x00, RequiresThisObject = 0x01 }; - Q_DECLARE_FLAGS(EvaluateFlags, EvaluateFlag) - QQmlBinding(const QString &, QObject *, QQmlContext *); QQmlBinding(const QQmlScriptString &, QObject *, QQmlContext *); QQmlBinding(const QString &, QObject *, QQmlContextData *); @@ -91,9 +88,6 @@ public: void setTarget(QObject *, const QQmlPropertyData &, QQmlContextData *); QQmlProperty property() const; - void setEvaluateFlags(EvaluateFlags flags); - EvaluateFlags evaluateFlags() const; - void setNotifyOnValueChanged(bool); // Inherited from QQmlAbstractExpression @@ -177,8 +171,6 @@ void QQmlBinding::setEnabledFlag(bool v) m_ctxt.setFlag2Value(v); } -Q_DECLARE_OPERATORS_FOR_FLAGS(QQmlBinding::EvaluateFlags) - QT_END_NAMESPACE Q_DECLARE_METATYPE(QQmlBinding*) -- cgit v1.2.3