diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-02-06 13:27:34 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-08 01:01:39 +0100 |
| commit | 74ff1216a449d6098975b3c9baca7abb1399211b (patch) | |
| tree | f3ea86c7efb9312b88d671fdd53480f10fc38888 /src | |
| parent | 814deac3b2abebc1fa60575264ecd24e5c98a36d (diff) | |
Don't hide virtual method.
Task-number: QTBUG-20994
Change-Id: Iaeeb23ed758ef52e0a3a61c4310aafec383e8a28
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quick/util/qdeclarativeanimation.cpp | 4 | ||||
| -rw-r--r-- | src/quick/util/qdeclarativeanimation_p.h | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/util/qdeclarativeanimation.cpp b/src/quick/util/qdeclarativeanimation.cpp index 9f6421b657..ad86c56836 100644 --- a/src/quick/util/qdeclarativeanimation.cpp +++ b/src/quick/util/qdeclarativeanimation.cpp @@ -989,7 +989,7 @@ QObject *QDeclarativePropertyAction::target() const return d->target; } -void QDeclarativePropertyAction::setTarget(QObject *o) +void QDeclarativePropertyAction::setTargetObject(QObject *o) { Q_D(QDeclarativePropertyAction); if (d->target == o) @@ -2208,7 +2208,7 @@ QObject *QDeclarativePropertyAnimation::target() const return d->target; } -void QDeclarativePropertyAnimation::setTarget(QObject *o) +void QDeclarativePropertyAnimation::setTargetObject(QObject *o) { Q_D(QDeclarativePropertyAnimation); if (d->target == o) diff --git a/src/quick/util/qdeclarativeanimation_p.h b/src/quick/util/qdeclarativeanimation_p.h index 5b69c5fb29..8bd6d4fbf5 100644 --- a/src/quick/util/qdeclarativeanimation_p.h +++ b/src/quick/util/qdeclarativeanimation_p.h @@ -195,7 +195,7 @@ class Q_QUICK_PRIVATE_EXPORT QDeclarativePropertyAction : public QDeclarativeAbs Q_OBJECT Q_DECLARE_PRIVATE(QDeclarativePropertyAction) - Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged) + Q_PROPERTY(QObject *target READ target WRITE setTargetObject NOTIFY targetChanged) Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged) Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged) Q_PROPERTY(QDeclarativeListProperty<QObject> targets READ targets) @@ -207,7 +207,7 @@ public: virtual ~QDeclarativePropertyAction(); QObject *target() const; - void setTarget(QObject *); + void setTargetObject(QObject *); QString property() const; void setProperty(const QString &); @@ -243,7 +243,7 @@ class Q_QUICK_PRIVATE_EXPORT QDeclarativePropertyAnimation : public QDeclarative Q_PROPERTY(QVariant from READ from WRITE setFrom NOTIFY fromChanged) Q_PROPERTY(QVariant to READ to WRITE setTo NOTIFY toChanged) Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged) - Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged) + Q_PROPERTY(QObject *target READ target WRITE setTargetObject NOTIFY targetChanged) Q_PROPERTY(QString property READ property WRITE setProperty NOTIFY propertyChanged) Q_PROPERTY(QString properties READ properties WRITE setProperties NOTIFY propertiesChanged) Q_PROPERTY(QDeclarativeListProperty<QObject> targets READ targets) @@ -266,7 +266,7 @@ public: void setEasing(const QEasingCurve &); QObject *target() const; - void setTarget(QObject *); + void setTargetObject(QObject *); QString property() const; void setProperty(const QString &); |