diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2010-02-05 05:58:19 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2010-02-05 06:02:16 (GMT) |
| commit | c5cd42cde88bc4fd630a6044a9d44d29dc3df595 (patch) | |
| tree | d297b43bbd93a636182325ab87a773d739861674 /src/declarative | |
| parent | 93ac24c12b2272cee75d37b4950baed6615ef1fb (diff) | |
| download | Qt-c5cd42cde88bc4fd630a6044a9d44d29dc3df595.zip Qt-c5cd42cde88bc4fd630a6044a9d44d29dc3df595.tar.gz Qt-c5cd42cde88bc4fd630a6044a9d44d29dc3df595.tar.bz2 | |
Fix Behaviors for object-type properties.
Task-number: QT-2269
Diffstat (limited to 'src/declarative')
| -rw-r--r-- | src/declarative/qml/qmlvmemetaobject.cpp | 2 | ||||
| -rw-r--r-- | src/declarative/util/qmlanimation_p.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp index 0886f1a..8faa922 100644 --- a/src/declarative/qml/qmlvmemetaobject.cpp +++ b/src/declarative/qml/qmlvmemetaobject.cpp @@ -110,7 +110,7 @@ int QmlVMEMetaObject::metaCall(QMetaObject::Call c, int _id, void **a) QPair<int, QmlPropertyValueInterceptor*> pair = interceptors.value(id); int valueIndex = pair.first; QmlPropertyValueInterceptor *vi = pair.second; - QVariant::Type type = property(id).type(); + int type = property(id).userType(); if (type != QVariant::Invalid) { if (valueIndex != -1) { diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index cb45266..6a69e4d 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -353,8 +353,7 @@ public: class Q_AUTOTEST_EXPORT QmlVector3dAnimation : public QmlPropertyAnimation { - - Q_OBJECT + Q_OBJECT Q_DECLARE_PRIVATE(QmlPropertyAnimation) Q_PROPERTY(QVector3D from READ from WRITE setFrom NOTIFY fromChanged) |