diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-10-11 11:09:17 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-17 01:05:43 +0200 |
| commit | 063c08ab8230249ad01c1698ba243b9bb3b238e5 (patch) | |
| tree | 38cd315aaddafc8d3eb93c2acf754d48bba1099c /src/declarative/qml/v8/qv8bindings_p.h | |
| parent | 576e7ae3360632a981177800e758679ee4105950 (diff) | |
Merge PropertyCache::Data and ValueTypeData
Change-Id: I22cbb159d009151dd77ecbcdad16f27ecb9d6dba
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Diffstat (limited to 'src/declarative/qml/v8/qv8bindings_p.h')
| -rw-r--r-- | src/declarative/qml/v8/qv8bindings_p.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/declarative/qml/v8/qv8bindings_p.h b/src/declarative/qml/v8/qv8bindings_p.h index 9b6fb84ed4..60b1afd551 100644 --- a/src/declarative/qml/v8/qv8bindings_p.h +++ b/src/declarative/qml/v8/qv8bindings_p.h @@ -53,6 +53,7 @@ // We mean it. // +#include "private/qdeclarativepropertycache_p.h" #include "private/qdeclarativeexpression_p.h" #include "private/qdeclarativebinding_p.h" @@ -73,7 +74,8 @@ public: virtual ~QV8Bindings(); QDeclarativeAbstractBinding *configBinding(int index, QObject *target, QObject *scope, - const QDeclarativeProperty &prop, int line); + const QDeclarativePropertyCache::Data &prop, + int line); private: Q_DISABLE_COPY(QV8Bindings) @@ -98,7 +100,8 @@ private: bool enabled:1; bool updating:1; int line; - QDeclarativeProperty property; + QObject *object; + QDeclarativePropertyCache::Data property; QV8Bindings *parent; }; |