diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-08-01 10:27:17 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-10 05:40:49 +0200 |
| commit | 4350877d6deb58f36df24164c6edde3302a3f1a3 (patch) | |
| tree | 5b1b121c1ce21aff1717de500282a5951f4e1267 /src/qml/qml/qqmlabstractbinding_p.h | |
| parent | 34ae6deb78c30a80570e0c0dda7b2f071abdbf68 (diff) | |
Permit value types with metatype IDs >= QMetaType::User
Remove the assumption that value types must be types defined by
Qt, having metatype IDs below QMetaType::User.
Task-number: QTBUG-26352
Change-Id: Ib5a56ff2e7892e82adf17a3a1e7517a0c9fe0534
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlabstractbinding_p.h')
| -rw-r--r-- | src/qml/qml/qqmlabstractbinding_p.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlabstractbinding_p.h b/src/qml/qml/qqmlabstractbinding_p.h index b9f8ecda5d..ae92077add 100644 --- a/src/qml/qml/qqmlabstractbinding_p.h +++ b/src/qml/qml/qqmlabstractbinding_p.h @@ -87,8 +87,9 @@ public: // Should return the encoded property index for the binding. Should return this value // even if the binding is not enabled or added to an object. - // Encoding is: coreIndex | (valueTypeIndex << 24) + // Encoding is: coreIndex | (valueTypeIndex << 16) int propertyIndex() const { return vtable()->propertyIndex(this); } + // Should return the object for the binding. Should return this object even if the // binding is not enabled or added to the object. QObject *object() const { return vtable()->object(this); } |