diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-02-29 13:55:58 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-02 07:22:53 +0100 |
| commit | 04fb631120590c55812a11a576dca48dafec6aea (patch) | |
| tree | 7b8d681eddd93a7ef21f4e668fee63ab943a9afb /src | |
| parent | 79608d6f72ea5963aed2fa161b9ef6781adbc41e (diff) | |
Return correct propertyIndex for v4 bindings.
Change-Id: I4aa37491d36331889f6b30c4d4af8b56cef96225
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/declarative/qml/v4/qv4bindings.cpp | 3 | ||||
| -rw-r--r-- | src/declarative/qml/v4/qv4bindings_p.h | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/declarative/qml/v4/qv4bindings.cpp b/src/declarative/qml/v4/qv4bindings.cpp index 2c26fff3d8..319dbf51bb 100644 --- a/src/declarative/qml/v4/qv4bindings.cpp +++ b/src/declarative/qml/v4/qv4bindings.cpp @@ -256,7 +256,8 @@ void QV4Bindings::Binding::destroy() int QV4Bindings::Binding::propertyIndex() const { - return property; + //mask out the type information set for value types + return property & 0xFF00FFFF; } QObject *QV4Bindings::Binding::object() const diff --git a/src/declarative/qml/v4/qv4bindings_p.h b/src/declarative/qml/v4/qv4bindings_p.h index 58dd4328af..a447481a4c 100644 --- a/src/declarative/qml/v4/qv4bindings_p.h +++ b/src/declarative/qml/v4/qv4bindings_p.h @@ -96,6 +96,8 @@ private: int index:30; bool enabled:1; bool updating:1; + // Encoding of property is coreIndex | (propType << 16) | (valueTypeIndex << 24) + // propType and valueTypeIndex are only set if the property is a value type property int property; QObject *scope; int line; |