From 304238b586b75ee73d46d2de4ffdb0ed40218b70 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Wed, 5 Aug 2009 11:43:16 +1000
Subject: QmlMetaProperty::binding() should only return a binding if it is
 enabled.

---
 src/declarative/qml/qmlmetaproperty.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp
index e6ffd50..afd28bb 100644
--- a/src/declarative/qml/qmlmetaproperty.cpp
+++ b/src/declarative/qml/qmlmetaproperty.cpp
@@ -490,7 +490,7 @@ QmlBinding *QmlMetaProperty::binding() const
         QObject *child = *iter;
         if (child->metaObject() == &QmlBinding::staticMetaObject) {
             QmlBinding *v = static_cast<QmlBinding *>(child);
-            if (v->property() == *this)
+            if (v->property() == *this && v->enabled())
                 return v;
         }
     }
-- 
cgit v0.12