diff options
| author | Yann Bodson <yann.bodson@nokia.com> | 2010-03-11 08:00:54 (GMT) |
|---|---|---|
| committer | Yann Bodson <yann.bodson@nokia.com> | 2010-03-11 08:00:54 (GMT) |
| commit | c97ea1ca81cc94d4a7e0e6bd579fa35fb1cf3b91 (patch) | |
| tree | feae028a1139b1e3d63f729dcb45689c4d5784fa /src/declarative/qml/qdeclarativeproperty_p.h | |
| parent | af7e91af39ea6e9bb64794d7be2f4ade52c17be2 (diff) | |
| parent | 9e504323b679d7fedfcfd975f202cc6dd96c9dcb (diff) | |
| download | Qt-c97ea1ca81cc94d4a7e0e6bd579fa35fb1cf3b91.zip Qt-c97ea1ca81cc94d4a7e0e6bd579fa35fb1cf3b91.tar.gz Qt-c97ea1ca81cc94d4a7e0e6bd579fa35fb1cf3b91.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativeproperty_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeproperty_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeproperty_p.h b/src/declarative/qml/qdeclarativeproperty_p.h index c31e2d3..26b85b8 100644 --- a/src/declarative/qml/qdeclarativeproperty_p.h +++ b/src/declarative/qml/qdeclarativeproperty_p.h @@ -110,7 +110,7 @@ public: const QVariant &value, int flags); static bool write(QObject *, const QDeclarativePropertyCache::Data &, const QVariant &, QDeclarativeContext *, WriteFlags flags = 0); - static QDeclarativeAbstractBinding *setBinding(QObject *, const QDeclarativePropertyCache::Data &, + static QDeclarativeAbstractBinding *setBinding(QObject *, int coreIndex, int valueTypeIndex /* -1 */, QDeclarativeAbstractBinding *, WriteFlags flags = DontRemoveBinding); @@ -133,6 +133,7 @@ public: QDeclarativeExpression *) ; static bool write(const QDeclarativeProperty &that, const QVariant &, WriteFlags); static int valueTypeCoreIndex(const QDeclarativeProperty &that); + static int bindingIndex(const QDeclarativeProperty &that); }; Q_DECLARE_OPERATORS_FOR_FLAGS(QDeclarativePropertyPrivate::WriteFlags) |