diff options
| -rw-r--r-- | src/declarative/animations/qsequentialanimationgroupjob.cpp | 1 | ||||
| -rw-r--r-- | src/quick/items/qquickanimation.cpp | 4 | ||||
| -rw-r--r-- | src/quick/items/qquickanimation_p.h | 8 | ||||
| -rw-r--r-- | src/quick/util/qdeclarativefontloader.cpp | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/src/declarative/animations/qsequentialanimationgroupjob.cpp b/src/declarative/animations/qsequentialanimationgroupjob.cpp index f186f390af..1d19873ec7 100644 --- a/src/declarative/animations/qsequentialanimationgroupjob.cpp +++ b/src/declarative/animations/qsequentialanimationgroupjob.cpp @@ -313,6 +313,7 @@ void QSequentialAnimationGroupJob::activateCurrentAnimation(bool intermediate) void QSequentialAnimationGroupJob::uncontrolledAnimationFinished(QAbstractAnimationJob *animation) { + Q_UNUSED(animation); Q_ASSERT(animation == m_currentAnimation); setUncontrolledAnimationFinishTime(m_currentAnimation, m_currentAnimation->currentTime()); diff --git a/src/quick/items/qquickanimation.cpp b/src/quick/items/qquickanimation.cpp index 4962fc21ce..233e44a4da 100644 --- a/src/quick/items/qquickanimation.cpp +++ b/src/quick/items/qquickanimation.cpp @@ -114,7 +114,7 @@ QQuickItem *QQuickParentAnimation::target() const return d->target; } -void QQuickParentAnimation::setTarget(QQuickItem *target) +void QQuickParentAnimation::setTargetObject(QQuickItem *target) { Q_D(QQuickParentAnimation); if (target == d->target) @@ -681,7 +681,7 @@ QQuickItem *QQuickPathAnimation::target() const return d->target; } -void QQuickPathAnimation::setTarget(QQuickItem *target) +void QQuickPathAnimation::setTargetObject(QQuickItem *target) { Q_D(QQuickPathAnimation); if (d->target == target) diff --git a/src/quick/items/qquickanimation_p.h b/src/quick/items/qquickanimation_p.h index 38eba6dc4f..3c8cd8f91b 100644 --- a/src/quick/items/qquickanimation_p.h +++ b/src/quick/items/qquickanimation_p.h @@ -57,7 +57,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickParentAnimation : public QDeclarativeAnimatio Q_OBJECT Q_DECLARE_PRIVATE(QQuickParentAnimation) - Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged) + Q_PROPERTY(QQuickItem *target READ target WRITE setTargetObject NOTIFY targetChanged) Q_PROPERTY(QQuickItem *newParent READ newParent WRITE setNewParent NOTIFY newParentChanged) Q_PROPERTY(QQuickItem *via READ via WRITE setVia NOTIFY viaChanged) @@ -66,7 +66,7 @@ public: virtual ~QQuickParentAnimation(); QQuickItem *target() const; - void setTarget(QQuickItem *); + void setTargetObject(QQuickItem *); QQuickItem *newParent() const; void setNewParent(QQuickItem *); @@ -129,7 +129,7 @@ class Q_QUICK_PRIVATE_EXPORT QQuickPathAnimation : public QDeclarativeAbstractAn Q_PROPERTY(int duration READ duration WRITE setDuration NOTIFY durationChanged) Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged) Q_PROPERTY(QDeclarativePath *path READ path WRITE setPath NOTIFY pathChanged) - Q_PROPERTY(QQuickItem *target READ target WRITE setTarget NOTIFY targetChanged) + Q_PROPERTY(QQuickItem *target READ target WRITE setTargetObject NOTIFY targetChanged) Q_PROPERTY(Orientation orientation READ orientation WRITE setOrientation NOTIFY orientationChanged) Q_PROPERTY(QPointF anchorPoint READ anchorPoint WRITE setAnchorPoint NOTIFY anchorPointChanged) Q_PROPERTY(int orientationEntryDuration READ orientationEntryDuration WRITE setOrientationEntryDuration NOTIFY orientationEntryDurationChanged) @@ -159,7 +159,7 @@ public: void setPath(QDeclarativePath *); QQuickItem *target() const; - void setTarget(QQuickItem *); + void setTargetObject(QQuickItem *); Orientation orientation() const; void setOrientation(Orientation orientation); diff --git a/src/quick/util/qdeclarativefontloader.cpp b/src/quick/util/qdeclarativefontloader.cpp index 78597b6efd..441ecf60dd 100644 --- a/src/quick/util/qdeclarativefontloader.cpp +++ b/src/quick/util/qdeclarativefontloader.cpp @@ -64,7 +64,7 @@ class QDeclarativeFontObject : public QObject Q_OBJECT public: - QDeclarativeFontObject(int _id); + explicit QDeclarativeFontObject(int _id = -1); void download(const QUrl &url, QNetworkAccessManager *manager); @@ -84,7 +84,7 @@ private: Q_DISABLE_COPY(QDeclarativeFontObject) }; -QDeclarativeFontObject::QDeclarativeFontObject(int _id = -1) +QDeclarativeFontObject::QDeclarativeFontObject(int _id) : QObject(0), id(_id), reply(0), redirectCount(0) {} |