diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-05 01:43:16 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-05 01:43:16 (GMT) |
| commit | 304238b586b75ee73d46d2de4ffdb0ed40218b70 (patch) | |
| tree | 3c5fd0cdfda0775bd2f9f691086d0a21069ca03a /src/declarative/qml/qmlmetaproperty.cpp | |
| parent | dba4cce953113926b0473dbe167f983a4aed0d08 (diff) | |
| download | Qt-304238b586b75ee73d46d2de4ffdb0ed40218b70.zip Qt-304238b586b75ee73d46d2de4ffdb0ed40218b70.tar.gz Qt-304238b586b75ee73d46d2de4ffdb0ed40218b70.tar.bz2 | |
QmlMetaProperty::binding() should only return a binding if it is enabled.
Diffstat (limited to 'src/declarative/qml/qmlmetaproperty.cpp')
| -rw-r--r-- | src/declarative/qml/qmlmetaproperty.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |