diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-21 07:24:36 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-21 07:24:36 (GMT) |
| commit | 34055e0160e2e94b0dd6b972c5bdc96a421adcf1 (patch) | |
| tree | bf7667e86dfe4d5c8e7ee3be40aa8862ff4042ca /src/declarative/qml/qmlmetaproperty.h | |
| parent | c301d995c646c70f8f943e2e4fc293a3e2d29edf (diff) | |
| parent | 8db694cb38e1f7f5096db96fcc1f168b13e643a4 (diff) | |
| download | Qt-34055e0160e2e94b0dd6b972c5bdc96a421adcf1.zip Qt-34055e0160e2e94b0dd6b972c5bdc96a421adcf1.tar.gz Qt-34055e0160e2e94b0dd6b972c5bdc96a421adcf1.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'src/declarative/qml/qmlmetaproperty.h')
| -rw-r--r-- | src/declarative/qml/qmlmetaproperty.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlmetaproperty.h b/src/declarative/qml/qmlmetaproperty.h index 688c4fd..fdcf9be 100644 --- a/src/declarative/qml/qmlmetaproperty.h +++ b/src/declarative/qml/qmlmetaproperty.h @@ -52,7 +52,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) class QObject; -class QmlBindableValue; +class QmlBinding; class QStringList; class QVariant; struct QMetaObject; @@ -121,8 +121,8 @@ public: QMetaProperty property() const; - QmlBindableValue *binding() const; - QmlBindableValue *setBinding(QmlBindableValue *) const; + QmlBinding *binding() const; + QmlBinding *setBinding(QmlBinding *) const; static QmlMetaProperty createProperty(QObject *, const QString &); |