diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2009-10-05 09:53:38 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2009-10-05 09:55:00 (GMT) |
commit | e548c48513546199c848e6cb08a60e8eccdab2c5 (patch) | |
tree | cbf5663bd7aaa4f9692fb619d4241395ad40824d /src/corelib/animation | |
parent | 32a9237c49fd126bee0cbe02c3c5bff5145a6e21 (diff) | |
download | Qt-e548c48513546199c848e6cb08a60e8eccdab2c5.zip Qt-e548c48513546199c848e6cb08a60e8eccdab2c5.tar.gz Qt-e548c48513546199c848e6cb08a60e8eccdab2c5.tar.bz2 |
QPropertyAnimation now uses QMetaObject::metacall instead of qt_metacall
This allows the animations to work with the newly integrated dynamic
metaobject
Reviewed-by: Michael Brasser
Diffstat (limited to 'src/corelib/animation')
-rw-r--r-- | src/corelib/animation/qpropertyanimation.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index b64d7df..4742e54 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -132,9 +132,9 @@ void QPropertyAnimationPrivate::updateProperty(const QVariant &newValue) } if (newValue.userType() == propertyType) { - //no conversion is needed, we directly call the QObject::qt_metacall + //no conversion is needed, we directly call the QMetaObject::metacall void *data = const_cast<void*>(newValue.constData()); - targetValue->qt_metacall(QMetaObject::WriteProperty, propertyIndex, &data); + QMetaObject::metacall(targetValue, QMetaObject::WriteProperty, propertyIndex, &data); } else { targetValue->setProperty(propertyName.constData(), newValue); } |