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/qqmlproperty_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/qqmlproperty_p.h')
| -rw-r--r-- | src/qml/qml/qqmlproperty_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/qqmlproperty_p.h b/src/qml/qml/qqmlproperty_p.h index 0131e7e1a4..501ab33112 100644 --- a/src/qml/qml/qqmlproperty_p.h +++ b/src/qml/qml/qqmlproperty_p.h @@ -104,7 +104,7 @@ public: static QQmlMetaObject rawMetaObjectForType(QQmlEnginePrivate *, int); static bool writeEnumProperty(const QMetaProperty &prop, int idx, QObject *object, const QVariant &value, int flags); - static bool writeValueProperty(QObject *, QQmlEngine *, + static bool writeValueProperty(QObject *, const QQmlPropertyData &, const QVariant &, QQmlContextData *, WriteFlags flags = 0); |