diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-03 01:00:13 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-03 01:00:13 +0100 |
| commit | bf0603fd03ade413036c7dba1ffe0e7ac9364fc9 (patch) | |
| tree | b6329f629c5c0a19ca419671ee328725daec699f /src/qml/animations | |
| parent | bb7a5d0cb6e62fa411e8b66759bf6b798c3f68d9 (diff) | |
| parent | 6b310e5f9a53c366fbb8fb78bd7c343aad4e0cdd (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I308b964d86ca01916f6af7d6e3f71557e3624eca
Diffstat (limited to 'src/qml/animations')
| -rw-r--r-- | src/qml/animations/qanimationgroupjob_p.h | 2 | ||||
| -rw-r--r-- | src/qml/animations/qpauseanimationjob_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/animations/qanimationgroupjob_p.h b/src/qml/animations/qanimationgroupjob_p.h index 44250079c7..b01b2f3b36 100644 --- a/src/qml/animations/qanimationgroupjob_p.h +++ b/src/qml/animations/qanimationgroupjob_p.h @@ -63,7 +63,7 @@ class Q_QML_PRIVATE_EXPORT QAnimationGroupJob : public QAbstractAnimationJob Q_DISABLE_COPY(QAnimationGroupJob) public: QAnimationGroupJob(); - ~QAnimationGroupJob(); + ~QAnimationGroupJob() override; void appendAnimation(QAbstractAnimationJob *animation); void prependAnimation(QAbstractAnimationJob *animation); diff --git a/src/qml/animations/qpauseanimationjob_p.h b/src/qml/animations/qpauseanimationjob_p.h index 53bf8a88b5..6c9bbf0dab 100644 --- a/src/qml/animations/qpauseanimationjob_p.h +++ b/src/qml/animations/qpauseanimationjob_p.h @@ -62,7 +62,7 @@ class Q_QML_PRIVATE_EXPORT QPauseAnimationJob : public QAbstractAnimationJob Q_DISABLE_COPY(QPauseAnimationJob) public: explicit QPauseAnimationJob(int duration = 250); - ~QPauseAnimationJob(); + ~QPauseAnimationJob() override; int duration() const override; void setDuration(int msecs); |