diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-02-10 03:03:27 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-02-10 03:03:27 (GMT) |
| commit | 6dbd2643ac8230bce652411dd5f8bd34567b387a (patch) | |
| tree | ea9865b020d427b64f04c1bd4d2513b80eff659b /src/declarative/util/qmlanimation_p.h | |
| parent | 582f8dcffae369b6d7fc6a0966cd4a8d65fdabab (diff) | |
| download | Qt-6dbd2643ac8230bce652411dd5f8bd34567b387a.zip Qt-6dbd2643ac8230bce652411dd5f8bd34567b387a.tar.gz Qt-6dbd2643ac8230bce652411dd5f8bd34567b387a.tar.bz2 | |
Revert "Replace QList<>* support with QmlListProperty"
This reverts commit d914555badcd4761864657e1e335e657b791453f.
Diffstat (limited to 'src/declarative/util/qmlanimation_p.h')
| -rw-r--r-- | src/declarative/util/qmlanimation_p.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index a566074..6a69e4d 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -187,8 +187,8 @@ class QmlPropertyAction : public QmlAbstractAnimation Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged) Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged) Q_PROPERTY(QString matchProperties READ properties WRITE setProperties NOTIFY propertiesChanged) - Q_PROPERTY(QmlListProperty<QObject> matchTargets READ targets) - Q_PROPERTY(QmlListProperty<QObject> exclude READ exclude) + Q_PROPERTY(QList<QObject *>* matchTargets READ targets) + Q_PROPERTY(QList<QObject *>* exclude READ exclude) Q_PROPERTY(QVariant value READ value WRITE setValue NOTIFY valueChanged) public: @@ -204,8 +204,8 @@ public: QString properties() const; void setProperties(const QString &); - QmlListProperty<QObject> targets(); - QmlListProperty<QObject> exclude(); + QList<QObject *> *targets(); + QList<QObject *> *exclude(); QVariant value() const; void setValue(const QVariant &); @@ -267,8 +267,8 @@ class Q_AUTOTEST_EXPORT QmlPropertyAnimation : public QmlAbstractAnimation Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged) Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY targetChanged) Q_PROPERTY(QString matchProperties READ properties WRITE setProperties NOTIFY propertiesChanged) - Q_PROPERTY(QmlListProperty<QObject> matchTargets READ targets) - Q_PROPERTY(QmlListProperty<QObject> exclude READ exclude) + Q_PROPERTY(QList<QObject *>* matchTargets READ targets) + Q_PROPERTY(QList<QObject *>* exclude READ exclude) public: QmlPropertyAnimation(QObject *parent=0); @@ -295,8 +295,8 @@ public: QString properties() const; void setProperties(const QString &); - QmlListProperty<QObject> targets(); - QmlListProperty<QObject> exclude(); + QList<QObject *> *targets(); + QList<QObject *> *exclude(); protected: virtual void transition(QmlStateActions &actions, |